GPII-383: Final changes before review - added last NP sets