Yeah, that does sound better. I'm going to be merging this in (unless you have space on your plate :P) so I'll take a look at that.