Change a bunch of stuff, probably unnecessarily