The Intelligence and Security Committee has reported the spy agency bill back to Parliament, with some changes.
However, they won't be enough to satisfy concerns about the extent of the Government Communications Security Bureau's ability to spy on New Zealanders and what is seen as the lack of adequate safeguards.
The revised bill includes an advisory panel to sit alongside the Inspector General of Intelligence and Security, and a set of guiding principles for the GCSB, as already flagged by Prime Minister John Key.
Other changes include the requirement for interception warrants to contain more specific information.
Other amendments will be introduced during the committee stages, as negotiated by independent MP Peter Dunne.