More major refactoring genious