primer: minor reordering