Fixed & refactored unwind