merge with Rémi + add conclusion (to be continued)