WIP: more reorder