Add checkboxes and else