Switching to Np++

It's cleaner this way.