Updated the MR with the suggested changes.