refactor bsp travel