More changes based on review.