Tested changes make sure doesn't effect calibration