Changes for cm+