changed a lot things