Changes for cm11