Yes, sounds good. I'll refactor it.