More changes per feedback.