Dinesh/routing update