Edit for CM