fixed the fucking refactoring