Made changes according to the feedback.