Inital changes for CM