diff --git a/Sources/MultiPicker/MultiPicker.swift b/Sources/MultiPicker/MultiPicker.swift
index ee7d162..ea22e5e 100644
--- a/Sources/MultiPicker/MultiPicker.swift
+++ b/Sources/MultiPicker/MultiPicker.swift
@@ -323,158 +323,141 @@ fileprivate struct MultiPickerSelectionList<SelectionValue: Hashable, Content: V
 
 // MARK: - Previews
 #if DEBUG
-struct MultiPicker_Previews: PreviewProvider {
 
-    static var previews: some View {
-        multiPickerListPreview()
-            .previewDisplayName("List Style")
+#Preview("List Style") {
+    @Previewable @State var multiSelection: Set<String> = ["1"]
+    let choices = ["1", "2", "3"]
 
-        multiPickerNavigationLinkPreview()
-            .previewDisplayName("Navigation Link Style Plain Style Choice")
-
-        multiPickerNavigationLinkRichChoicePreview()
-            .previewDisplayName("Navigation Link Style Rich Style Choice")
+    Form {
+        Section {
+            MultiPicker("Regular", selection: $multiSelection) {
+                ForEach(choices, id: \.self) {
+                    Text("\($0)")
+                        .mpTag($0)
+                }
+            }
+        }
+        Section {
+            MultiPickerSelectionList(selection: $multiSelection, indicatorPosition: .trailing) {
+                ForEach(choices, id: \.self) {
+                    Text("\($0)")
+                        .mpTag($0)
+                }
+            }
+        }
+        Section {
+            MultiPickerSelectionList(selection: $multiSelection) {
+                ForEach(choices, id: \.self) {
+                    Text("\($0)")
+                        .mpTag($0)
+                }
+            }.environment(\.layoutDirection, .rightToLeft)
+        }
+        Section {
+            MultiPickerSelectionList(selection: $multiSelection, indicatorPosition: .trailing) {
+                ForEach(choices, id: \.self) {
+                    Text("\($0)")
+                        .mpTag($0)
+                }
+            }.environment(\.layoutDirection, .rightToLeft)
+        }
     }
+}
 
-    static func multiPickerListPreview() -> some View {
-        PreviewBindingHelper2(values: (["1", "2", "3"], Set(arrayLiteral: "1"))) { (choices: Binding<[String]>, multiSelection: Binding<Set<String>>) in
-
-            Form {
-                Section {
-                    MultiPicker("Regular", selection: multiSelection) {
-                        ForEach(choices.wrappedValue, id: \.self) {
-                            Text("\($0)")
-                                .mpTag($0)
-                        }
+#Preview("Navigation Link Style Plain Style Choice") {
+    @Previewable @State var oneSelection: String = "1"
+    @Previewable @State var oneOrNoneSelection: String? = "1"
+    @Previewable @State var multiSelection: Set<String> = ["1"]
+    let choices = ["1", "2", "3"]
+
+    NavigationStack {
+        Form {
+            Section("SwiftUI") {
+                Picker("Only One", selection: $oneSelection) {
+                    ForEach(choices, id: \.self) {
+                        Text("\($0)")
+                            .tag($0)
                     }
                 }
-                Section {
-                    MultiPickerSelectionList(selection: multiSelection, indicatorPosition: .trailing) {
-                        ForEach(choices.wrappedValue, id: \.self) {
-                            Text("\($0)")
-                                .mpTag($0)
-                        }
+            }
+#if !os(macOS)
+            //                .pickerStyle(.navigationLink)
+#endif
+            Section("MultiPicker") {
+                MultiPicker("Only One", selection: $oneSelection) {
+                    ForEach(choices, id: \.self) {
+                        Text("\($0)")
+                            .mpTag($0)
                     }
                 }
-                Section {
-                    MultiPickerSelectionList(selection: multiSelection) {
-                        ForEach(choices.wrappedValue, id: \.self) {
-                            Text("\($0)")
-                                .mpTag($0)
-                        }
-                    }.environment(\.layoutDirection, .rightToLeft)
+                MultiPicker("Multi", selection: $multiSelection as Binding<Set<String>>) {
+                    ForEach(choices, id: \.self) {
+                        Text("\($0)")
+                            .mpTag($0)
+                    }
                 }
-                Section {
-                    MultiPickerSelectionList(selection: multiSelection, indicatorPosition: .trailing) {
-                        ForEach(choices.wrappedValue, id: \.self) {
-                            Text("\($0)")
-                                .mpTag($0)
-                        }
-                    }.environment(\.layoutDirection, .rightToLeft)
+                MultiPicker("One or None", selection: $oneOrNoneSelection) {
+                    ForEach(choices, id: \.self) {
+                        Text("\($0)")
+                            .mpTag($0)
+                    }
                 }
             }
+            .mpPickerStyle(.navigationLink)
         }
     }
+}
 
-    static func multiPickerNavigationLinkPreview() -> some View {
-        NavigationStack {
-            PreviewBindingHelper4(values: (["1", "2", "3"], "1", Optional<String>("1"), Set(arrayLiteral: "1") as Set<String>)) { (choices: Binding<[String]>, oneSelection: Binding<String>, oneOrNoneSelection: Binding<String?>, multiSelection: Binding<Set<String>>) in
-                Form {
-                    Section("SwiftUI") {
-                        Picker("Only One", selection: oneSelection) {
-                            ForEach(choices.wrappedValue, id: \.self) {
-                                Text("\($0)")
-                                    .tag($0)
-                            }
-                        }
-                    }
-                    #if !os(macOS)
-                    //                .pickerStyle(.navigationLink)
-                    #endif
-                    Section("MultiPicker") {
-                        MultiPicker("Only One", selection: oneSelection) {
-                            ForEach(choices.wrappedValue, id: \.self) {
-                                Text("\($0)")
-                                    .mpTag($0)
-                            }
-                        }
-                        MultiPicker("Multi", selection: multiSelection as Binding<Set<String>>) {
-                            ForEach(choices.wrappedValue, id: \.self) {
-                                Text("\($0)")
-                                    .mpTag($0)
-                            }
-                        }
-                        MultiPicker("One or None", selection: oneOrNoneSelection) {
-                            ForEach(choices.wrappedValue, id: \.self) {
-                                Text("\($0)")
-                                    .mpTag($0)
-                            }
-                        }
+#Preview("Navigation Link Style Rich Style Choice") {
+    @Previewable @State var oneSelection = Model(title: String(localized: "Red"), color: .red)
+    @Previewable @State var oneOrNoneSelection: Model? = Model(title: String(localized: "Red"), color: .red)
+    @Previewable @State var multiSelection: Set<Model> = [Model(title: String(localized: "Red"), color: .red)]
+    let choices = [
+        Model(title: String(localized: "Red"), color: .red),
+        Model(title: String(localized: "Orange"), color: .orange),
+        Model(title: String(localized: "Yellow"), color: .yellow),
+        Model(title: String(localized: "Green"), color: .green),
+        Model(title: String(localized: "Blue"), color: .blue),
+        Model(title: String(localized: "Indigo"), color: .indigo),
+        Model(title: String(localized: "Violet"), color: .purple),
+    ]
+
+    NavigationStack {
+        Form {
+            Section("SwiftUI") {
+                Picker("Only One", selection: $oneSelection) {
+                    ForEach(choices, id: \.self) {
+                        ModelCell(model: $0)
+                            .tag($0)
                     }
-                    .mpPickerStyle(.navigationLink)
                 }
             }
-        }
-    }
-
-    static func multiPickerNavigationLinkRichChoicePreview() -> some View {
-        NavigationStack {
-            PreviewBindingHelper4(
-                values: (
-                    [
-                        Model(title: String(localized: "Red"), color: .red),
-                        Model(title: String(localized: "Orange"), color: .orange),
-                        Model(title: String(localized: "Yellow"), color: .yellow),
-                        Model(title: String(localized: "Green"), color: .green),
-                        Model(title: String(localized: "Blue"), color: .blue),
-                        Model(title: String(localized: "Indigo"), color: .indigo),
-                        Model(title: String(localized: "Violet"), color: .purple),
-                    ],
-                    Model(title: String(localized: "Red"), color: .red),
-                    Optional(Model(title: String(localized: "Red"), color: .red)),
-                    Set(arrayLiteral: Model(title: String(localized: "Red"), color: .red)) as Set<Model>
-                )
-            ) { (choices: Binding<[Model]>,
-                 oneSelection: Binding<Model>,
-                 oneOrNoneSelection: Binding<Model?>,
-                 multiSelection: Binding<Set<Model>>) in
-                Form {
-                    Section("SwiftUI") {
-                        Picker("Only One", selection: oneSelection) {
-                            ForEach(choices.wrappedValue, id: \.self) {
-                                ModelCell(model: $0)
-                                    .tag($0)
-                            }
-                        }
+            .pickerStyle(.navigationLink)
+#if !os(macOS)
+            //                .pickerStyle(.navigationLink)
+#endif
+            Section("MultiPicker") {
+                MultiPicker("Only One", selection: $oneSelection) {
+                    ForEach(choices, id: \.self) {
+                        ModelCell(model: $0)
+                            .mpTag($0)
                     }
-                    .pickerStyle(.navigationLink)
-                    #if !os(macOS)
-                    //                .pickerStyle(.navigationLink)
-                    #endif
-                    Section("MultiPicker") {
-                        MultiPicker("Only One", selection: oneSelection) {
-                            ForEach(choices.wrappedValue, id: \.self) {
-                                ModelCell(model: $0)
-                                    .mpTag($0)
-                            }
-                        }
-                        MultiPicker("Multi", selection: multiSelection as Binding<Set<Model>>) {
-                            ForEach(choices.wrappedValue, id: \.self) {
-                                ModelCell(model: $0)
-                                    .mpTag($0)
-                            }
-                        }
-                        MultiPicker("One or None", selection: oneOrNoneSelection) {
-                            ForEach(choices.wrappedValue, id: \.self) {
-                                ModelCell(model: $0)
-                                    .mpTag($0)
-                            }
-                        }
+                }
+                MultiPicker("Multi", selection: $multiSelection as Binding<Set<Model>>) {
+                    ForEach(choices, id: \.self) {
+                        ModelCell(model: $0)
+                            .mpTag($0)
+                    }
+                }
+                MultiPicker("One or None", selection: $oneOrNoneSelection) {
+                    ForEach(choices, id: \.self) {
+                        ModelCell(model: $0)
+                            .mpTag($0)
                     }
-                    .mpPickerStyle(.navigationLink)
-                    .choiceRepresentationStyle(.rich)
                 }
             }
+            .mpPickerStyle(.navigationLink)
+            .choiceRepresentationStyle(.rich)
         }
     }
 }