added same day arrival case