Reorder some stuff.