Add logic to subtract 24 hours for arrivals departing before midnight