commit of thibaut's version