Refactor jumps and implement JR