Routing improved a lot :metal: