Update from Christophe Combelles.