[Felix] Refactored.