Add date_until & change time_until calculation