Changes from Natalia's comments