Added the rest of the checkboxes