changed a couple of thing