small re-ordering