Thanks. I think this is the better candidate for PR than mine code:)