Changed to checkboxes