refactor bb for future compound changes