massive update to catch up with CM