Merge BB - NEW CHECKBOXES \o/