Added more arrival code.