changed things for cm