Changes to address Juan's comments