changed Switch to CheckBox