Update after third review.