Reordered fields in accordance with Per's preference.