Checkboxes for issue #9