Add back disable_cal