No... Didn't think of that... Will have a look tomorrow to see if we can make this cleaner/better :)