NorC's uncommitted changes