Addressing comments from review.