I have addressed all feedbacks, please review