Addressed Elisa's comments.