Additional changes based on feedback.