My changes

plz merge