updated order of fields