FIX: some of Gael comments