improved stopping and don't calibrate at the beginning