Arnaud & Alex modifications