I have attached a patch.
Adding an after-patch screenshot. please review