After major refactoring.