Changes for CM