integrate content from Franck and Olivier