Fix/changes1