Add Juan's comments