Improved the CMS