reordered fields to make more sense