That's a good idea. I'll refactor that.  Thanks