took into account most xxx and XXX comments from Thierry