incorporate nvm changes