Hmm... yeah that's a much better solution.