Taking into account francoispenaud review comment