Changed lots of things