Changing unroll logic to perform unrolling immediately