Added a no-checkboxes version