NVR-master-Modified (second commit)