More rewriting of CNC communication