Actually refactored.