Revert "Revert "jjv modifications to save memory usage, time and disk space""

This reverts commit b717e1ac8002bcfcb20140758b87518a932dcf7b.
reset checkin all NRM files (not sure what all the changes were since last commit)