Proposed changes to CMM 2021-01