Changed Radar and Calibration classes