Update to #1 review.