wip: integrating the work of emilien (boby)