A lot of CM changes