@Mincus
Let's wait until he's tested both! Yours is maybe more robust.
Regards
MD