Incorporated Feedback from review