changed more stuff for BB test