Updated routing and logging for stop