Before final refactoring