reordered fields
minor edit