OK, so current proposed changes are below:

test results look good.

Thanks,

greg