updated for CM