merged with antoines changes