Shift function order for better grouping