Removing the word NVP For the most part from the actual code