modification taking some comments of Thierry in XXX