Better version with checkboxes