Ok, I'll refactor