Minor reordering of CMS items