update to use bb and underscore from compoennt/instead local