Updated according to Feedback.