Minor changes from Juana.