Cm 10.1

These patches may be better