redoing checkboxes
fixed conflicts