Changes requested by Javier Bravo