That works for me, I think. I'll refactor that today.