Readded my changes to RoutingTable6