Re-order and rename funtions