This was refactored.