updated order of loading