more modifications to routing