Change TODO for Guillaume