Yes, I'll refactor it.