I have addressed all the feedbacks. please review