That's a nice one. @tarzzz you should use that to clean up much of the code.