Lots of changes, now its time for the CMS