Updates after comments.