Following discussion with Flavien