First changes based on feedback.