ADDED - 
1. Minor changes to NOOP