Updates for CM12