Changed a lot of things