NMP Additions

Unknownblah