made routing work more better