Addressed feedbacks and rebased the MR