Refactor -mbb