changes suggested by Cédric