Revert "Will Revert: modified NP object for standalones"

This reverts commit b2ae44975cea721c65353b2ed984f6dda5ac7f76.