minor changes for CM