first_cal important bug fix. result still doesnt look right?