updates for cm-11.0