Updated to cm-12.0