first_cal MAJOR BUG FIX