updated switch and depth calibration