incorporating all of Hila's NP updates