Haven't had time to test this yet, but thanks very much for your invaluable input.

So close..... Must be improving