After refactoring.