CM11 changes