Updated to CMS10 compass