Refactored BB tree to use more ARIA