Improvements based on feedback.