Updated to NPM version