Enforce standards. Lots of changes