shuffled things around, added nzp