Updated the Existing MR with suggested changes.