More next-train stuff