Yeah, I can see the current solution be sub-optimal. I'll apply some more love...