OK, here is the current proposed change - tests look good:

Any comments/opposition from the community?

Thanks,

greg