Fix/changes2