CNMs: Proposed Revisions to CMM-2004-02