Updated according to Feedback