Nice refactoring. I'll fix it.