Massive update to catch up with CM