edits from cm-10.2