Revised draft CMM proposal for discussion - track change version