Updated the way we handle checkboxes