Modified a bunch of stuff