That sounds like a better way to do it.
I shall add those changes when I get a chance and push it to my branch.