reorder some stuff