Reordering for CL setup