changed a lot of style