I have a improved version too, now.

Thanks to you and Michael! :-)