refactored queue_route