Addressed all feedbacks in MR. please review