Addressed first round of comments.