David's and Ignacio's suggestions are reflected