Reorder some stuff