Working on the new routing system adaptation.