Changed a bunch of stuff again