Revert "nsm"

This reverts commit 4b762458eea5adf76f39d28779af11b161e9c7c3.
Revert "Revert "nsm""

This reverts commit 9a21c6e2886c743ee2c03af0561a257aef95eee3.