Improvements to GHS-nz