CNC upgrades