Changed a few thing