After first refactoring