[@BantlingBee]Ok. I made those changes. Let me know if it's sufficient.