The second phase of firearms reforms are back on track, after a compromise was reached with New Zealand First.
Last year a law making most semi-automatic firearms illegal passed with near unanimous political support in the wake of the mosque attacks.
But the second phase setting up a national register and a tougher licensing regime has been a much harder ask.
RNZ political editor Jane Patterson has the story.