Integrated last contributions from Herve.