Reorder some stuff
Reorder some stuff v2