Lots of changes to get the arch closer to where I want it to be