[@Themerlinhawk] Actually I think what you have now works!