Revised draft CMM proposal for discussion - clean version