Changed field names and equation.