Routing

Modifications on the routing.