Reorder functions
Redocumented