Work. Without any refactoring