[CNC] CNC System upgrade