Updated with departure time (fixed NaN)