Yep, much simpler and elegant. Thanks for the hint!