second commit from remi
merge conflict resolved for toto