Iwi leaders are relieved the three waters shake-up keeps mana whenua representation in the new water entities.
But while the arrangement -- which the Prime Minister insists isn't co-governance -- remains, there are still plenty to iron out.
Here's Māori news editor Jamie Tahana.