some updates to CMS