After getting feedback from Tom,I made some changes to the patch Attached is a revised version.
Attach a file by drag & drop or click to upload
