Ok, refactored.