Lots of crazy changes