Addressing more Reviewer comments.