minor changes and fix for nvp logic