Update after Philippe's review
12 files changed