Changes to reflect the ones made in the CMS