After merging Frank's changes into the CMS