Changes for BB