I'll have a look at changing this around tomorrow and report my success, or failure.