Reorder functions
Rename function