Updates after review.