made routing more bundle like