More changes after review.