Addressing PR Comment.