updated order of functions