changed order of fields