Improve arrival detection