Addressed feedbacks on MR. please review