Small changes according to Izaskun de la Torre's remarks