Changed lots of stuff