more cm12 changes