A little reordering