Updates after reviews.