added setpoint and state fields