update for cm-11.0