more improvements to the cms