more routing modifications