Decouple wandering from arriving