In addition to changes made by the Health Committee, I propose to make additional changes by a Supplementary Order Paper, which I've already tabled so members can consider it in advance of the committee of the whole House stage. My Supplementary Order Paper will extend the transition window for water suppliers that are not registered under the Health Act, so they have to register with Taumata Arowai by the end of the fourth year and have seven years to comply. This extension will give the system time to mature and for Taumata Arowai to work with suppliers to ensure the regime is fit for purpose. This also aligns with the Government's reform of water service delivery arrangements, which proposes to establish a small number of national water service entities by 2024.