Improvements based on feedback