changed a lot of things