Makes changes

this is an update by Michalis