new calibration function + more driving states