Update Jessica's Final Version: 6.5 no unroll