Refactored arrival time method