More work on checkboxes