bsp refactor
bsp refactor