Added libraries back and updated calibration finding