CNC upgrade 2