NSM and DSM fully implemented