Changes from review.