NNPH Setup Updates