Changed field order