Update to latest version of CMX