Refactored, broken something