Reordering stuff, better