nshmp-haz refactor