Addressed Javad's comments.