added checkboxes - previous functionality maintained