I have attached a patch. Please review.
I have attached an after-patch screen...