Made changes based on feedback.