changing the way I handle first_date