change function order
controller changes