Routing improved