Changing a few thing around