Fixed unwinding, added Nav6 code back in