Version working without refactor