Reordering properly