final commit to CMS, then work on CMS