saved changes from Joulien onto github