moved arrival times out of generator