Finish Clash (without refactoring)