Updated to new name.
Added checkboxes.