Don’t Scrap Your NOC, Modernize It!