diff --git a/fast_barcode_scanner/.fvmrc b/fast_barcode_scanner/.fvmrc
new file mode 100644
index 00000000..906bbb34
--- /dev/null
+++ b/fast_barcode_scanner/.fvmrc
@@ -0,0 +1,3 @@
+{
+  "flutter": "3.24.3"
+}
\ No newline at end of file
diff --git a/fast_barcode_scanner/.gitignore b/fast_barcode_scanner/.gitignore
index e9dc58d3..19909647 100644
--- a/fast_barcode_scanner/.gitignore
+++ b/fast_barcode_scanner/.gitignore
@@ -5,3 +5,6 @@
 .pub/
 
 build/
+
+# FVM Version Cache
+.fvm/
\ No newline at end of file
diff --git a/fast_barcode_scanner/.metadata b/fast_barcode_scanner/.metadata
index ccb634bb..5d1b501d 100644
--- a/fast_barcode_scanner/.metadata
+++ b/fast_barcode_scanner/.metadata
@@ -1,10 +1,33 @@
 # This file tracks properties of this Flutter project.
 # Used by Flutter tool to assess capabilities and perform upgrades etc.
 #
-# This file should be version controlled and should not be manually edited.
+# This file should be version controlled.
 
 version:
-  revision: 8af6b2f038c1172e61d418869363a28dffec3cb4
+  revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
   channel: stable
 
 project_type: plugin
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+      base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+    - platform: android
+      create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+      base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+    - platform: ios
+      create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+      base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'
diff --git a/fast_barcode_scanner/.vscode/settings.json b/fast_barcode_scanner/.vscode/settings.json
new file mode 100644
index 00000000..965328da
--- /dev/null
+++ b/fast_barcode_scanner/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+  "dart.flutterSdkPath": ".fvm/versions/3.24.3"
+}
\ No newline at end of file
diff --git a/fast_barcode_scanner/CHANGELOG.md b/fast_barcode_scanner/CHANGELOG.md
index 4622a6bb..7f3b3c1b 100644
--- a/fast_barcode_scanner/CHANGELOG.md
+++ b/fast_barcode_scanner/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 2.0.1
+
+- Updating Flutter dependencies to version 3
+- Updating Dart SDK used to version 3.3.4
+- Updating Kotlin version 1.9.23
+- Downgrading Gradle to version 7.4
+- Updating CameraX to version 1.3.4
+- Updating MLKit to version 17.2.0
+
 ## 2.0.0-dev.2
 
 - Analyze still images from binary or native image pickers on iOS and Android
diff --git a/fast_barcode_scanner/analysis_options.yaml b/fast_barcode_scanner/analysis_options.yaml
index a3be6b82..e69de29b 100644
--- a/fast_barcode_scanner/analysis_options.yaml
+++ b/fast_barcode_scanner/analysis_options.yaml
@@ -1 +0,0 @@
-include: package:flutter_lints/flutter.yaml
\ No newline at end of file
diff --git a/fast_barcode_scanner/android/.gitignore b/fast_barcode_scanner/android/.gitignore
index c6cbe562..161bdcda 100644
--- a/fast_barcode_scanner/android/.gitignore
+++ b/fast_barcode_scanner/android/.gitignore
@@ -6,3 +6,4 @@
 .DS_Store
 /build
 /captures
+.cxx
diff --git a/fast_barcode_scanner/android/build.gradle b/fast_barcode_scanner/android/build.gradle
index f34c7408..6f03e937 100644
--- a/fast_barcode_scanner/android/build.gradle
+++ b/fast_barcode_scanner/android/build.gradle
@@ -2,19 +2,19 @@ group 'com.jhoogstraat.fast_barcode_scanner'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.5.30'
+    ext.kotlin_version = '1.9.23'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.2'
+        classpath 'com.android.tools.build:gradle:7.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
-rootProject.allprojects {
+allprojects {
     repositories {
         google()
         mavenCentral()
@@ -25,23 +25,55 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 31
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.jhoogstraat.fast_barcode_scanner'
+    }
+
+    compileSdk 34
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
+        test.java.srcDirs += 'src/test/kotlin'
     }
 
     defaultConfig {
-        minSdkVersion 21
+        minSdk 21
     }
-}
 
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    dependencies {
+        testImplementation 'org.jetbrains.kotlin:kotlin-test'
+        testImplementation 'org.mockito:mockito-core:5.0.0'
+
+        def camerax_version = "1.3.4"
+        def mlkit_version = "17.2.0"
+        implementation "androidx.camera:camera-camera2:$camerax_version"
+        implementation "androidx.camera:camera-lifecycle:$camerax_version"
+        implementation "com.google.mlkit:barcode-scanning:$mlkit_version"
+    }
+
+    testOptions {
+        unitTests.all {
+            useJUnitPlatform()
+
+            testLogging {
+               events "passed", "skipped", "failed", "standardOut", "standardError"
+               outputs.upToDateWhen {false}
+               showStandardStreams = true
+            }
+        }
+    }
+}
 
-    def camerax_version = "1.1.0-alpha10"
-    def mlkit_version = "17.0.0"
-    implementation "androidx.camera:camera-camera2:$camerax_version"
-    implementation "androidx.camera:camera-lifecycle:$camerax_version"
-    implementation "com.google.mlkit:barcode-scanning:$mlkit_version"
+configurations.implementation {
+    exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk7'
+    exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8'
 }
diff --git a/fast_barcode_scanner/android/gradle.properties b/fast_barcode_scanner/android/gradle.properties
deleted file mode 100644
index 94adc3a3..00000000
--- a/fast_barcode_scanner/android/gradle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-org.gradle.jvmargs=-Xmx1536M
-android.useAndroidX=true
-android.enableJetifier=true
diff --git a/fast_barcode_scanner/android/gradle/wrapper/gradle-wrapper.properties b/fast_barcode_scanner/android/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..89dcc40c
--- /dev/null
+++ b/fast_barcode_scanner/android/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/fast_barcode_scanner/android/src/main/kotlin/com/jhoogstraat/fast_barcode_scanner/Camera.kt b/fast_barcode_scanner/android/src/main/kotlin/com/jhoogstraat/fast_barcode_scanner/Camera.kt
index 08f15049..69497693 100644
--- a/fast_barcode_scanner/android/src/main/kotlin/com/jhoogstraat/fast_barcode_scanner/Camera.kt
+++ b/fast_barcode_scanner/android/src/main/kotlin/com/jhoogstraat/fast_barcode_scanner/Camera.kt
@@ -7,6 +7,7 @@ import android.util.Log
 import android.view.Surface
 import androidx.camera.core.*
 import androidx.camera.core.Camera
+import androidx.camera.core.resolutionselector.ResolutionSelector
 import androidx.camera.lifecycle.ProcessCameraProvider
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
@@ -14,7 +15,7 @@ import androidx.lifecycle.LifecycleOwner
 import com.google.android.gms.tasks.Task
 import com.google.android.gms.tasks.TaskCompletionSource
 import com.google.common.util.concurrent.ListenableFuture
-import com.google.mlkit.vision.barcode.Barcode
+import com.google.mlkit.vision.barcode.common.Barcode
 import com.google.mlkit.vision.barcode.BarcodeScannerOptions
 import com.jhoogstraat.fast_barcode_scanner.scanner.MLKitBarcodeScanner
 import com.jhoogstraat.fast_barcode_scanner.types.*
@@ -199,7 +200,7 @@ class Camera(
         cameraSurfaceProvider = Preview.SurfaceProvider {
             val surfaceTexture = flutterTextureEntry.surfaceTexture()
             surfaceTexture.setDefaultBufferSize(it.resolution.width, it.resolution.height)
-            it.provideSurface(Surface(surfaceTexture), cameraExecutor, {})
+            it.provideSurface(Surface(surfaceTexture), cameraExecutor) {}
         }
 
         // Attach the viewfinder's surface provider to preview use case
diff --git a/fast_barcode_scanner/android/src/main/kotlin/com/jhoogstraat/fast_barcode_scanner/FastBarcodeScannerPlugin.kt b/fast_barcode_scanner/android/src/main/kotlin/com/jhoogstraat/fast_barcode_scanner/FastBarcodeScannerPlugin.kt
index b5d1a0ec..f9c09044 100644
--- a/fast_barcode_scanner/android/src/main/kotlin/com/jhoogstraat/fast_barcode_scanner/FastBarcodeScannerPlugin.kt
+++ b/fast_barcode_scanner/android/src/main/kotlin/com/jhoogstraat/fast_barcode_scanner/FastBarcodeScannerPlugin.kt
@@ -1,5 +1,6 @@
 package com.jhoogstraat.fast_barcode_scanner
 
+import android.util.Log
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
@@ -12,7 +13,7 @@ import androidx.core.content.ContextCompat
 import com.google.android.gms.tasks.Task
 import com.google.android.gms.tasks.TaskCompletionSource
 import com.google.android.gms.tasks.Tasks
-import com.google.mlkit.vision.barcode.Barcode
+import com.google.mlkit.vision.barcode.common.Barcode
 import com.google.mlkit.vision.barcode.BarcodeScannerOptions
 import com.google.mlkit.vision.barcode.BarcodeScanning
 import com.google.mlkit.vision.common.InputImage
@@ -42,7 +43,7 @@ class FastBarcodeScannerPlugin : FlutterPlugin, MethodCallHandler, StreamHandler
     private var pluginBinding: FlutterPlugin.FlutterPluginBinding? = null
     private var activityBinding: ActivityPluginBinding? = null
     private var camera: Camera? = null
-
+    
     override fun onAttachedToEngine(@NonNull flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
         commandChannel = MethodChannel(
             flutterPluginBinding.binaryMessenger,
@@ -89,8 +90,8 @@ class FastBarcodeScannerPlugin : FlutterPlugin, MethodCallHandler, StreamHandler
     }
 
     /* Detections EventChannel */
-    override fun onListen(arguments: Any?, events: EventChannel.EventSink?) {
-        detectionEventSink = events
+    override fun onListen(arguments: Any?, sink: EventChannel.EventSink?) {
+        detectionEventSink = sink
     }
 
     override fun onCancel(arguments: Any?) {
@@ -241,7 +242,7 @@ class FastBarcodeScannerPlugin : FlutterPlugin, MethodCallHandler, StreamHandler
 
                 return pickImageCompleter!!.task.continueWithTask {
                     if (it.result == null) Tasks.forResult(null) else
-                        scanner.process(InputImage.fromFilePath(activityBinding.activity, it.result))
+                        scanner.process(InputImage.fromFilePath(activityBinding.activity, it.result as Uri))
                 }
             }
         }
diff --git a/fast_barcode_scanner/android/src/main/kotlin/com/jhoogstraat/fast_barcode_scanner/scanner/MLKitBarcodeScanner.kt b/fast_barcode_scanner/android/src/main/kotlin/com/jhoogstraat/fast_barcode_scanner/scanner/MLKitBarcodeScanner.kt
index 128ffbee..219d1b85 100644
--- a/fast_barcode_scanner/android/src/main/kotlin/com/jhoogstraat/fast_barcode_scanner/scanner/MLKitBarcodeScanner.kt
+++ b/fast_barcode_scanner/android/src/main/kotlin/com/jhoogstraat/fast_barcode_scanner/scanner/MLKitBarcodeScanner.kt
@@ -5,7 +5,7 @@ import androidx.camera.core.ImageAnalysis
 import androidx.camera.core.ImageProxy
 import com.google.android.gms.tasks.OnFailureListener
 import com.google.android.gms.tasks.OnSuccessListener
-import com.google.mlkit.vision.barcode.Barcode
+import com.google.mlkit.vision.barcode.common.Barcode
 import com.google.mlkit.vision.barcode.BarcodeScannerOptions
 import com.google.mlkit.vision.barcode.BarcodeScanning
 import com.google.mlkit.vision.common.InputImage
diff --git a/fast_barcode_scanner/android/src/main/kotlin/com/jhoogstraat/fast_barcode_scanner/types/ScannerConfiguration.kt b/fast_barcode_scanner/android/src/main/kotlin/com/jhoogstraat/fast_barcode_scanner/types/ScannerConfiguration.kt
index 5853240a..7339a0a7 100644
--- a/fast_barcode_scanner/android/src/main/kotlin/com/jhoogstraat/fast_barcode_scanner/types/ScannerConfiguration.kt
+++ b/fast_barcode_scanner/android/src/main/kotlin/com/jhoogstraat/fast_barcode_scanner/types/ScannerConfiguration.kt
@@ -1,7 +1,7 @@
 package com.jhoogstraat.fast_barcode_scanner.types
 
 import android.util.Size
-import com.google.mlkit.vision.barcode.Barcode
+import com.google.mlkit.vision.barcode.common.Barcode
 
 data class ScannerConfiguration(val formats: IntArray, val mode: DetectionMode, val resolution: Resolution, val framerate: Framerate, val position: CameraPosition)
 
diff --git a/fast_barcode_scanner/android/src/test/kotlin/com/jhoogstraat/fast_barcode_scanner/FastBarcodeScannerPluginTest.kt b/fast_barcode_scanner/android/src/test/kotlin/com/jhoogstraat/fast_barcode_scanner/FastBarcodeScannerPluginTest.kt
new file mode 100644
index 00000000..cc7a241d
--- /dev/null
+++ b/fast_barcode_scanner/android/src/test/kotlin/com/jhoogstraat/fast_barcode_scanner/FastBarcodeScannerPluginTest.kt
@@ -0,0 +1,27 @@
+package com.jhoogstraat.fast_barcode_scanner
+
+import io.flutter.plugin.common.MethodCall
+import io.flutter.plugin.common.MethodChannel
+import kotlin.test.Test
+import org.mockito.Mockito
+
+/*
+ * This demonstrates a simple unit test of the Kotlin portion of this plugin's implementation.
+ *
+ * Once you have built the plugin's example app, you can run these tests from the command
+ * line by running `./gradlew testDebugUnitTest` in the `example/android/` directory, or
+ * you can run them directly from IDEs that support JUnit such as Android Studio.
+ */
+
+internal class FastBarcodeScannerPluginTest {
+  @Test
+  fun onMethodCall_getPlatformVersion_returnsExpectedValue() {
+    val plugin = FastBarcodeScannerPlugin()
+
+    val call = MethodCall("getPlatformVersion", null)
+    val mockResult: MethodChannel.Result = Mockito.mock(MethodChannel.Result::class.java)
+    plugin.onMethodCall(call, mockResult)
+
+    Mockito.verify(mockResult).success("Android " + android.os.Build.VERSION.RELEASE)
+  }
+}
diff --git a/fast_barcode_scanner/example/.metadata b/fast_barcode_scanner/example/.metadata
index f941867c..44e9a3f5 100644
--- a/fast_barcode_scanner/example/.metadata
+++ b/fast_barcode_scanner/example/.metadata
@@ -1,10 +1,33 @@
 # This file tracks properties of this Flutter project.
 # Used by Flutter tool to assess capabilities and perform upgrades etc.
 #
-# This file should be version controlled and should not be manually edited.
+# This file should be version controlled.
 
 version:
-  revision: 4b330ddbedab445481cc73d50a4695b9154b4e4f
-  channel: dev
+  revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+  channel: stable
 
 project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+      base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+    - platform: android
+      create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+      base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+    - platform: ios
+      create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+      base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'
diff --git a/fast_barcode_scanner/example/android/app/build.gradle b/fast_barcode_scanner/example/android/app/build.gradle
index c8e7bb57..208f6ceb 100644
--- a/fast_barcode_scanner/example/android/app/build.gradle
+++ b/fast_barcode_scanner/example/android/app/build.gradle
@@ -26,7 +26,9 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 31
+    namespace "com.jhoogstraat.fast_barcode_scanner_example"
+    compileSdk 34
+    ndkVersion flutter.ndkVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -43,8 +45,8 @@ android {
 
     defaultConfig {
         applicationId "com.jhoogstraat.fast_barcode_scanner_example"
-        minSdkVersion 21
-        targetSdkVersion 31
+        minSdk 21
+        targetSdk 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
@@ -63,5 +65,10 @@ flutter {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+
 }
+
+configurations.implementation {
+    exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk7'
+    exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8'
+}
\ No newline at end of file
diff --git a/fast_barcode_scanner/example/android/app/src/debug/AndroidManifest.xml b/fast_barcode_scanner/example/android/app/src/debug/AndroidManifest.xml
index d40405e5..399f6981 100644
--- a/fast_barcode_scanner/example/android/app/src/debug/AndroidManifest.xml
+++ b/fast_barcode_scanner/example/android/app/src/debug/AndroidManifest.xml
@@ -1,6 +1,6 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.jhoogstraat.fast_barcode_scanner_example">
-    <!-- Flutter needs it to communicate with the running application
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>
diff --git a/fast_barcode_scanner/example/android/app/src/main/AndroidManifest.xml b/fast_barcode_scanner/example/android/app/src/main/AndroidManifest.xml
index 8d2640af..b9b683d8 100644
--- a/fast_barcode_scanner/example/android/app/src/main/AndroidManifest.xml
+++ b/fast_barcode_scanner/example/android/app/src/main/AndroidManifest.xml
@@ -1,17 +1,16 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.jhoogstraat.fast_barcode_scanner_example">
-   <application
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application
         android:label="fast_barcode_scanner_example"
+        android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
+            android:exported="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
-            android:screenOrientation="portrait"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
-            android:windowSoftInputMode="adjustResize"
-            android:exported="true">
+            android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues
diff --git a/fast_barcode_scanner/example/android/app/src/main/kotlin/com/jhoogstraat/fast_barcode_scanner_example/MainActivity.kt b/fast_barcode_scanner/example/android/app/src/main/kotlin/com/jhoogstraat/fast_barcode_scanner_example/MainActivity.kt
index 0202db3c..6447b34f 100644
--- a/fast_barcode_scanner/example/android/app/src/main/kotlin/com/jhoogstraat/fast_barcode_scanner_example/MainActivity.kt
+++ b/fast_barcode_scanner/example/android/app/src/main/kotlin/com/jhoogstraat/fast_barcode_scanner_example/MainActivity.kt
@@ -2,4 +2,5 @@ package com.jhoogstraat.fast_barcode_scanner_example
 
 import io.flutter.embedding.android.FlutterActivity
 
-class MainActivity: FlutterActivity()
\ No newline at end of file
+class MainActivity: FlutterActivity() {
+}
diff --git a/fast_barcode_scanner/example/android/app/src/main/res/values-night/styles.xml b/fast_barcode_scanner/example/android/app/src/main/res/values-night/styles.xml
index 449a9f93..06952be7 100644
--- a/fast_barcode_scanner/example/android/app/src/main/res/values-night/styles.xml
+++ b/fast_barcode_scanner/example/android/app/src/main/res/values-night/styles.xml
@@ -3,14 +3,14 @@
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
     <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
-             Flutter draws its first frame -->
+             the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
          Flutter UI initializes, as well as behind your Flutter UI while its
          running.
-         
+
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
     <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
diff --git a/fast_barcode_scanner/example/android/app/src/main/res/values/styles.xml b/fast_barcode_scanner/example/android/app/src/main/res/values/styles.xml
index d74aa35c..cb1ef880 100644
--- a/fast_barcode_scanner/example/android/app/src/main/res/values/styles.xml
+++ b/fast_barcode_scanner/example/android/app/src/main/res/values/styles.xml
@@ -3,14 +3,14 @@
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
     <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
-             Flutter draws its first frame -->
+             the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
          Flutter UI initializes, as well as behind your Flutter UI while its
          running.
-         
+
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
     <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
diff --git a/fast_barcode_scanner/example/android/app/src/profile/AndroidManifest.xml b/fast_barcode_scanner/example/android/app/src/profile/AndroidManifest.xml
index d40405e5..399f6981 100644
--- a/fast_barcode_scanner/example/android/app/src/profile/AndroidManifest.xml
+++ b/fast_barcode_scanner/example/android/app/src/profile/AndroidManifest.xml
@@ -1,6 +1,6 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.jhoogstraat.fast_barcode_scanner_example">
-    <!-- Flutter needs it to communicate with the running application
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>
diff --git a/fast_barcode_scanner/example/android/build.gradle b/fast_barcode_scanner/example/android/build.gradle
index 3648aa99..bc157bd1 100644
--- a/fast_barcode_scanner/example/android/build.gradle
+++ b/fast_barcode_scanner/example/android/build.gradle
@@ -1,16 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.5.30'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()
@@ -21,9 +8,11 @@ allprojects {
 rootProject.buildDir = '../build'
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
+}
+subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/fast_barcode_scanner/example/android/gradle.properties b/fast_barcode_scanner/example/android/gradle.properties
index 94adc3a3..598d13fe 100644
--- a/fast_barcode_scanner/example/android/gradle.properties
+++ b/fast_barcode_scanner/example/android/gradle.properties
@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx4G
 android.useAndroidX=true
 android.enableJetifier=true
diff --git a/fast_barcode_scanner/example/android/gradle/wrapper/gradle-wrapper.properties b/fast_barcode_scanner/example/android/gradle/wrapper/gradle-wrapper.properties
index b8793d3c..7645e290 100644
--- a/fast_barcode_scanner/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/fast_barcode_scanner/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
diff --git a/fast_barcode_scanner/example/android/settings.gradle b/fast_barcode_scanner/example/android/settings.gradle
index 44e62bcf..1d6d19b7 100644
--- a/fast_barcode_scanner/example/android/settings.gradle
+++ b/fast_barcode_scanner/example/android/settings.gradle
@@ -1,11 +1,26 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }
+    settings.ext.flutterSdkPath = flutterSdkPath()
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+    includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
 
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
 
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "7.3.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.7.10" apply false
+}
+
+include ":app"
diff --git a/fast_barcode_scanner/example/assets/barcodes_2.png b/fast_barcode_scanner/example/assets/barcodes_2.png
new file mode 100644
index 00000000..4a95b987
Binary files /dev/null and b/fast_barcode_scanner/example/assets/barcodes_2.png differ
diff --git a/fast_barcode_scanner/example/ios/Flutter/AppFrameworkInfo.plist b/fast_barcode_scanner/example/ios/Flutter/AppFrameworkInfo.plist
index 9625e105..1dc6cf76 100644
--- a/fast_barcode_scanner/example/ios/Flutter/AppFrameworkInfo.plist
+++ b/fast_barcode_scanner/example/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>11.0</string>
+  <string>13.0</string>
 </dict>
 </plist>
diff --git a/fast_barcode_scanner/example/ios/Podfile b/fast_barcode_scanner/example/ios/Podfile
index 7258736e..3e44f9c6 100644
--- a/fast_barcode_scanner/example/ios/Podfile
+++ b/fast_barcode_scanner/example/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-platform :ios, '11.0'
+platform :ios, '13.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@@ -32,7 +32,9 @@ target 'Runner' do
   use_modular_headers!
 
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
-  pod 'SwiftLint'
+  target 'RunnerTests' do
+    inherit! :search_paths
+  end
 end
 
 post_install do |installer|
diff --git a/fast_barcode_scanner/example/ios/Podfile.lock b/fast_barcode_scanner/example/ios/Podfile.lock
index 32c45333..acc82e02 100644
--- a/fast_barcode_scanner/example/ios/Podfile.lock
+++ b/fast_barcode_scanner/example/ios/Podfile.lock
@@ -2,28 +2,27 @@ PODS:
   - fast_barcode_scanner (0.0.1):
     - Flutter
   - Flutter (1.0.0)
-  - SwiftLint (0.43.1)
+  - integration_test (0.0.1):
+    - Flutter
 
 DEPENDENCIES:
   - fast_barcode_scanner (from `.symlinks/plugins/fast_barcode_scanner/ios`)
   - Flutter (from `Flutter`)
-  - SwiftLint
-
-SPEC REPOS:
-  trunk:
-    - SwiftLint
+  - integration_test (from `.symlinks/plugins/integration_test/ios`)
 
 EXTERNAL SOURCES:
   fast_barcode_scanner:
     :path: ".symlinks/plugins/fast_barcode_scanner/ios"
   Flutter:
     :path: Flutter
+  integration_test:
+    :path: ".symlinks/plugins/integration_test/ios"
 
 SPEC CHECKSUMS:
   fast_barcode_scanner: 1c1cb51eccce89ad32444eb67eccf83cf50d984e
-  Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
-  SwiftLint: 99f82d07b837b942dd563c668de129a03fc3fb52
+  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
+  integration_test: 13825b8a9334a850581300559b8839134b124670
 
-PODFILE CHECKSUM: 58a7cccdf4f43e87b1f36ea2656f74cdd4292a26
+PODFILE CHECKSUM: a57f30d18f102dd3ce366b1d62a55ecbef2158e5
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.15.2
diff --git a/fast_barcode_scanner/example/ios/Runner.xcodeproj/project.pbxproj b/fast_barcode_scanner/example/ios/Runner.xcodeproj/project.pbxproj
index 284e5ddb..0bd52bc1 100644
--- a/fast_barcode_scanner/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/fast_barcode_scanner/example/ios/Runner.xcodeproj/project.pbxproj
@@ -3,19 +3,31 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
+		331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
+		670948AC134BD91595870090 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9CB918F44C3D4ACD5BF12CEE /* Pods_Runner.framework */; };
+		67C1162B6BC73E257C496EB5 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4037E41A7CACEB13FD30113F /* Pods_RunnerTests.framework */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
-		C12B152F088A75900597FA22 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FEA366923ED0898133D535DA /* Pods_Runner.framework */; };
 /* End PBXBuildFile section */
 
+/* Begin PBXContainerItemProxy section */
+		331C8085294A63A400263BE5 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 97C146E61CF9000F007C117D /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 97C146ED1CF9000F007C117D;
+			remoteInfo = Runner;
+		};
+/* End PBXContainerItemProxy section */
+
 /* Begin PBXCopyFilesBuildPhase section */
 		9705A1C41CF9048500538489 /* Embed Frameworks */ = {
 			isa = PBXCopyFilesBuildPhase;
@@ -32,11 +44,14 @@
 /* Begin PBXFileReference section */
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
-		2E20C458AD24D1D54F104BE2 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
+		331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
+		331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
+		4037E41A7CACEB13FD30113F /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
+		9561571D0F399355D0282CB8 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
 		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -44,9 +59,12 @@
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		C06B84C9D85A48044C2AA0B3 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
-		DA2B070FD26FB1748D9B5090 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
-		FEA366923ED0898133D535DA /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		9CB918F44C3D4ACD5BF12CEE /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		9CCF8313EE99AD5F01F8F811 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
+		A3CF99FDFE6E8B1C3D563860 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
+		B2630D02B2421332EAD1C2A0 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
+		BF4D72FC1F109D08F817C205 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
+		D848F3249F90654D66C98F55 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -54,13 +72,29 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C12B152F088A75900597FA22 /* Pods_Runner.framework in Frameworks */,
+				670948AC134BD91595870090 /* Pods_Runner.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		D212D05C5E7939F1E679D642 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				67C1162B6BC73E257C496EB5 /* Pods_RunnerTests.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		331C8082294A63A400263BE5 /* RunnerTests */ = {
+			isa = PBXGroup;
+			children = (
+				331C807B294A618700263BE5 /* RunnerTests.swift */,
+			);
+			path = RunnerTests;
+			sourceTree = "<group>";
+		};
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
@@ -78,8 +112,9 @@
 				9740EEB11CF90186004384FC /* Flutter */,
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
-				A325A0A2122DFDC0AC203F91 /* Pods */,
-				D89F5488C23A13FD29CCD469 /* Frameworks */,
+				331C8082294A63A400263BE5 /* RunnerTests */,
+				B6720CCA5BDDC9FD96044FBC /* Pods */,
+				ADF95D57EDDFE624685EA8AA /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -87,6 +122,7 @@
 			isa = PBXGroup;
 			children = (
 				97C146EE1CF9000F007C117D /* Runner.app */,
+				331C8081294A63A400263BE5 /* RunnerTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -106,40 +142,62 @@
 			path = Runner;
 			sourceTree = "<group>";
 		};
-		A325A0A2122DFDC0AC203F91 /* Pods */ = {
+		ADF95D57EDDFE624685EA8AA /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				2E20C458AD24D1D54F104BE2 /* Pods-Runner.debug.xcconfig */,
-				DA2B070FD26FB1748D9B5090 /* Pods-Runner.release.xcconfig */,
-				C06B84C9D85A48044C2AA0B3 /* Pods-Runner.profile.xcconfig */,
+				9CB918F44C3D4ACD5BF12CEE /* Pods_Runner.framework */,
+				4037E41A7CACEB13FD30113F /* Pods_RunnerTests.framework */,
 			);
-			path = Pods;
+			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		D89F5488C23A13FD29CCD469 /* Frameworks */ = {
+		B6720CCA5BDDC9FD96044FBC /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				FEA366923ED0898133D535DA /* Pods_Runner.framework */,
+				9CCF8313EE99AD5F01F8F811 /* Pods-Runner.debug.xcconfig */,
+				A3CF99FDFE6E8B1C3D563860 /* Pods-Runner.release.xcconfig */,
+				D848F3249F90654D66C98F55 /* Pods-Runner.profile.xcconfig */,
+				B2630D02B2421332EAD1C2A0 /* Pods-RunnerTests.debug.xcconfig */,
+				9561571D0F399355D0282CB8 /* Pods-RunnerTests.release.xcconfig */,
+				BF4D72FC1F109D08F817C205 /* Pods-RunnerTests.profile.xcconfig */,
 			);
-			name = Frameworks;
+			path = Pods;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
+		331C8080294A63A400263BE5 /* RunnerTests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
+			buildPhases = (
+				3C5A5F14EFF33414FDEDCAC0 /* [CP] Check Pods Manifest.lock */,
+				331C807D294A63A400263BE5 /* Sources */,
+				331C807F294A63A400263BE5 /* Resources */,
+				D212D05C5E7939F1E679D642 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				331C8086294A63A400263BE5 /* PBXTargetDependency */,
+			);
+			name = RunnerTests;
+			productName = RunnerTests;
+			productReference = 331C8081294A63A400263BE5 /* RunnerTests.xctest */;
+			productType = "com.apple.product-type.bundle.unit-test";
+		};
 		97C146ED1CF9000F007C117D /* Runner */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
-				8F53D3E91D4E07E453207DB4 /* [CP] Check Pods Manifest.lock */,
+				24B341A9D0B4297912DCD5C4 /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				CACE898BFCFE3908763D9CB5 /* [CP] Embed Pods Frameworks */,
-				92FF8FF1269777A000BD125E /* SwiftLint */,
+				DAC04C4E741DBDD941B70AA5 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -156,9 +214,13 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
+					331C8080294A63A400263BE5 = {
+						CreatedOnToolsVersion = 14.0;
+						TestTargetID = 97C146ED1CF9000F007C117D;
+					};
 					97C146ED1CF9000F007C117D = {
 						CreatedOnToolsVersion = 7.3.1;
 						LastSwiftMigration = 1100;
@@ -179,11 +241,19 @@
 			projectRoot = "";
 			targets = (
 				97C146ED1CF9000F007C117D /* Runner */,
+				331C8080294A63A400263BE5 /* RunnerTests */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXResourcesBuildPhase section */
+		331C807F294A63A400263BE5 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		97C146EC1CF9000F007C117D /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -198,43 +268,45 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
+		24B341A9D0B4297912DCD5C4 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
+			inputFileListPaths = (
+			);
 			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
 			);
-			name = "Thin Binary";
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
 		};
-		8F53D3E91D4E07E453207DB4 /* [CP] Check Pods Manifest.lock */ = {
+		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputFileListPaths = (
-			);
 			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
+				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
 			);
+			name = "Thin Binary";
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
-		92FF8FF1269777A000BD125E /* SwiftLint */ = {
+		3C5A5F14EFF33414FDEDCAC0 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -242,18 +314,23 @@
 			inputFileListPaths = (
 			);
 			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
-			name = SwiftLint;
+			name = "[CP] Check Pods Manifest.lock";
 			outputFileListPaths = (
 			);
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "${PODS_ROOT}/SwiftLint/swiftlint --fix ${PROJECT_DIR}/../../ios/Classes\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
 		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -266,7 +343,7 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
-		CACE898BFCFE3908763D9CB5 /* [CP] Embed Pods Frameworks */ = {
+		DAC04C4E741DBDD941B70AA5 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -286,6 +363,14 @@
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
+		331C807D294A63A400263BE5 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		97C146EA1CF9000F007C117D /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -297,6 +382,14 @@
 		};
 /* End PBXSourcesBuildPhase section */
 
+/* Begin PBXTargetDependency section */
+		331C8086294A63A400263BE5 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 97C146ED1CF9000F007C117D /* Runner */;
+			targetProxy = 331C8085294A63A400263BE5 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
 /* Begin PBXVariantGroup section */
 		97C146FA1CF9000F007C117D /* Main.storyboard */ = {
 			isa = PBXVariantGroup;
@@ -358,7 +451,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -374,14 +467,14 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = R9NY9W8HNJ;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "com.jhoogstraat.fast-barcode-scanner-example";
+				PRODUCT_BUNDLE_IDENTIFIER = com.jhoogstraat.fastBarcodeScannerExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -389,6 +482,56 @@
 			};
 			name = Profile;
 		};
+		331C8088294A63A400263BE5 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = B2630D02B2421332EAD1C2A0 /* Pods-RunnerTests.debug.xcconfig */;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				GENERATE_INFOPLIST_FILE = YES;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.jhoogstraat.fastBarcodeScannerExample.RunnerTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
+			};
+			name = Debug;
+		};
+		331C8089294A63A400263BE5 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 9561571D0F399355D0282CB8 /* Pods-RunnerTests.release.xcconfig */;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				GENERATE_INFOPLIST_FILE = YES;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.jhoogstraat.fastBarcodeScannerExample.RunnerTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
+			};
+			name = Release;
+		};
+		331C808A294A63A400263BE5 /* Profile */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = BF4D72FC1F109D08F817C205 /* Pods-RunnerTests.profile.xcconfig */;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				GENERATE_INFOPLIST_FILE = YES;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.jhoogstraat.fastBarcodeScannerExample.RunnerTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
+			};
+			name = Profile;
+		};
 		97C147031CF9000F007C117D /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -436,7 +579,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -485,7 +628,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -503,14 +646,14 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = R9NY9W8HNJ;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "com.jhoogstraat.fast-barcode-scanner-example";
+				PRODUCT_BUNDLE_IDENTIFIER = com.jhoogstraat.fastBarcodeScannerExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -526,14 +669,14 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = R9NY9W8HNJ;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "com.jhoogstraat.fast-barcode-scanner-example";
+				PRODUCT_BUNDLE_IDENTIFIER = com.jhoogstraat.fastBarcodeScannerExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -544,6 +687,16 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
+		331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				331C8088294A63A400263BE5 /* Debug */,
+				331C8089294A63A400263BE5 /* Release */,
+				331C808A294A63A400263BE5 /* Profile */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
diff --git a/fast_barcode_scanner/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/fast_barcode_scanner/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index 3db53b6e..8e3ca5df 100644
--- a/fast_barcode_scanner/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/fast_barcode_scanner/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +36,19 @@
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "331C8080294A63A400263BE5"
+               BuildableName = "RunnerTests.xctest"
+               BlueprintName = "RunnerTests"
+               ReferencedContainer = "container:Runner.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -61,8 +70,6 @@
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Profile"
diff --git a/fast_barcode_scanner/example/ios/Runner/Info.plist b/fast_barcode_scanner/example/ios/Runner/Info.plist
index 9ed1ed24..0ae806f4 100644
--- a/fast_barcode_scanner/example/ios/Runner/Info.plist
+++ b/fast_barcode_scanner/example/ios/Runner/Info.plist
@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>fast_barcode_scanner</string>
+	<string>Fast Barcode Scanner Example</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -24,10 +24,6 @@
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-	<key>NSBonjourServices</key>
-	<array>
-		<string>_dartobservatory._tcp</string>
-	</array>
 	<key>NSCameraUsageDescription</key>
 	<string>Used to capture barcodes</string>
 	<key>UILaunchStoryboardName</key>
@@ -37,6 +33,8 @@
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>
@@ -47,5 +45,9 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 </dict>
 </plist>
diff --git a/fast_barcode_scanner/example/lib/configure_screen/configure_screen.dart b/fast_barcode_scanner/example/lib/configure_screen/configure_screen.dart
index f61526e3..d15cffbb 100644
--- a/fast_barcode_scanner/example/lib/configure_screen/configure_screen.dart
+++ b/fast_barcode_scanner/example/lib/configure_screen/configure_screen.dart
@@ -1,6 +1,6 @@
 import 'package:fast_barcode_scanner/fast_barcode_scanner.dart';
+import 'package:fast_barcode_scanner_example/configure_screen/overlay_selector.dart';
 import 'package:fast_barcode_scanner_example/scanning_screen/scanning_overlay_config.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
 import 'type_selector.dart';
@@ -10,8 +10,7 @@ typedef OnOverlayConfigurationChanged = void Function(
 
 class ConfigureScreen extends StatefulWidget {
   const ConfigureScreen(this._currentConfiguration, this._overlayConfig,
-      {Key? key, this.onOverlayConfigurationChanged})
-      : super(key: key);
+      {super.key, this.onOverlayConfigurationChanged});
 
   final ScannerConfiguration _currentConfiguration;
   final ScanningOverlayConfig _overlayConfig;
@@ -53,18 +52,18 @@ class _ConfigureScreenState extends State<ConfigureScreen> {
               ),
             );
 
-            if (shouldReturn == true) {
+            if (shouldReturn && context.mounted) {
               Navigator.pop(context);
             }
           },
         ),
         actions: [
           TextButton(
+            onPressed: applyChanges,
             child: const Text(
               'Apply',
               style: TextStyle(color: Colors.white),
             ),
-            onPressed: applyChanges,
           )
         ],
       ),
@@ -74,8 +73,7 @@ class _ConfigureScreenState extends State<ConfigureScreen> {
           tiles: [
             ListTile(
               title: const Text('Active code types'),
-              subtitle:
-                  Text(_config.types.map((e) => describeEnum(e)).join(', ')),
+              subtitle: Text(_config.types.map((e) => e.name).join(', ')),
               onTap: () async {
                 final types = await Navigator.push<List<BarcodeType>>(context,
                     MaterialPageRoute(builder: (_) {
@@ -113,37 +111,39 @@ class _ConfigureScreenState extends State<ConfigureScreen> {
               trailing: DropdownButton<CameraPosition>(
                   value: _config.position,
                   onChanged: (value) {
-                    setState(() {
-                      _config = _config.copyWith(position: value);
-                    });
+                    setState(() => _config = _config.copyWith(position: value));
                   },
                   items: buildDropdownItems(CameraPosition.values)),
             ),
             ListTile(
               title: const Text('Detection Mode'),
               trailing: DropdownButton<DetectionMode>(
-                  value: _config.detectionMode,
-                  onChanged: (value) {
-                    setState(() {
-                      _config = _config.copyWith(detectionMode: value);
-                    });
-                  },
-                  items: buildDropdownItems(DetectionMode.values)),
+                value: _config.detectionMode,
+                onChanged: (value) {
+                  setState(
+                    () => _config = _config.copyWith(detectionMode: value),
+                  );
+                },
+                items: buildDropdownItems(DetectionMode.values),
+              ),
             ),
             ListTile(
               title: const Text('Overlay'),
-              trailing: DropdownButton<ScanningOverlayType?>(
-                  value: _overlayConfig.enabledOverlay,
-                  onChanged: (value) {
-                    setState(() {
-                      if (value == ScanningOverlayType.none) {
-                        value = null;
-                      }
-                      _overlayConfig = _overlayConfig.copyWith(enabledOverlay: value);
-                    });
-                    widget.onOverlayConfigurationChanged?.call(_overlayConfig);
-                  },
-                  items: buildDropdownItems(ScanningOverlayType.values)),
+              subtitle: Text(
+                  _overlayConfig.enabledOverlays.map((e) => e.name).join(', ')),
+              onTap: () async {
+                final overlayRoute = MaterialPageRoute(
+                  builder: (_) => OverlaySelector(_overlayConfig),
+                );
+
+                final overlays = await Navigator.push(context, overlayRoute);
+
+                setState(() {
+                  _overlayConfig = _overlayConfig.copyWith(
+                    enabledOverlays: overlays,
+                  );
+                });
+              },
             ),
           ],
         ).toList(),
@@ -151,15 +151,15 @@ class _ConfigureScreenState extends State<ConfigureScreen> {
     );
   }
 
-  List<DropdownMenuItem<E>> buildDropdownItems<E extends Object>(
+  List<DropdownMenuItem<E>> buildDropdownItems<E extends Enum>(
           List<E> enumCases) =>
       enumCases
-          .map((v) => DropdownMenuItem(value: v, child: Text(describeEnum(v))))
+          .map((v) => DropdownMenuItem(value: v, child: Text(v.name)))
           .toList();
 
   Future<void> applyChanges() async {
     try {
-      await CameraController().configure(
+      await CameraController.shared.configure(
         types: _config.types,
         framerate: _config.framerate,
         resolution: _config.resolution,
@@ -167,6 +167,8 @@ class _ConfigureScreenState extends State<ConfigureScreen> {
         position: _config.position,
       );
     } catch (error) {
+      if (!mounted) return;
+
       showDialog(
         context: context,
         builder: (_) => AlertDialog(
@@ -176,8 +178,10 @@ class _ConfigureScreenState extends State<ConfigureScreen> {
       );
 
       return;
+    } finally {
+      if (mounted) {
+        Navigator.pop(context, _config);
+      }
     }
-
-    Navigator.pop(context, _config);
   }
 }
diff --git a/fast_barcode_scanner/example/lib/configure_screen/overlay_selector.dart b/fast_barcode_scanner/example/lib/configure_screen/overlay_selector.dart
new file mode 100644
index 00000000..7a53497e
--- /dev/null
+++ b/fast_barcode_scanner/example/lib/configure_screen/overlay_selector.dart
@@ -0,0 +1,59 @@
+import 'package:fast_barcode_scanner/fast_barcode_scanner.dart';
+import 'package:fast_barcode_scanner_example/scanning_screen/scanning_overlay_config.dart';
+import 'package:flutter/material.dart';
+
+class OverlaySelector extends StatefulWidget {
+  const OverlaySelector(this._config, {super.key});
+
+  final ScanningOverlayConfig _config;
+
+  @override
+  State<OverlaySelector> createState() => _OverlaySelectorState();
+}
+
+class _OverlaySelectorState extends State<OverlaySelector> {
+  _OverlaySelectorState();
+
+  @override
+  void initState() {
+    super.initState();
+    _items = ScanningOverlayType.values.map((e) => e.name).toList();
+    _selected = widget._config.enabledOverlays.toList();
+  }
+
+  late List<String> _items;
+  late List<ScanningOverlayType> _selected;
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('Overlay Types'),
+        leading: BackButton(
+          onPressed: () => Navigator.pop(context, _selected),
+        ),
+      ),
+      body: ListView.separated(
+        itemBuilder: (ctx, idx) {
+          final item = ScanningOverlayType.values.elementAt(idx);
+          return CheckboxListTile(
+            key: Key(_items[idx]),
+            value: _selected.contains(item),
+            title: Text(_items[idx]),
+            onChanged: (newValue) {
+              setState(() {
+                if (newValue == true) {
+                  _selected.add(item);
+                } else {
+                  _selected.remove(item);
+                }
+              });
+            },
+          );
+        },
+        separatorBuilder: (_, __) => const Divider(height: 1),
+        itemCount: BarcodeType.values.length,
+      ),
+    );
+  }
+}
diff --git a/fast_barcode_scanner/example/lib/configure_screen/type_selector.dart b/fast_barcode_scanner/example/lib/configure_screen/type_selector.dart
index a97d33ae..90cde031 100644
--- a/fast_barcode_scanner/example/lib/configure_screen/type_selector.dart
+++ b/fast_barcode_scanner/example/lib/configure_screen/type_selector.dart
@@ -1,9 +1,8 @@
 import 'package:fast_barcode_scanner/fast_barcode_scanner.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
 class BarcodeTypeSelector extends StatefulWidget {
-  const BarcodeTypeSelector(this._config, {Key? key}) : super(key: key);
+  const BarcodeTypeSelector(this._config, {super.key});
 
   final ScannerConfiguration _config;
 
@@ -17,7 +16,7 @@ class _BarcodeTypeSelectorState extends State<BarcodeTypeSelector> {
   @override
   void initState() {
     super.initState();
-    _items = BarcodeType.values.map((e) => describeEnum(e)).toList();
+    _items = BarcodeType.values.map((e) => e.name).toList();
     _selected = widget._config.types.toList();
   }
 
diff --git a/fast_barcode_scanner/example/lib/history_screen/history_screen.dart b/fast_barcode_scanner/example/lib/history_screen/history_screen.dart
index 130eca1e..ffc6b3ec 100644
--- a/fast_barcode_scanner/example/lib/history_screen/history_screen.dart
+++ b/fast_barcode_scanner/example/lib/history_screen/history_screen.dart
@@ -1,13 +1,12 @@
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
 import '../scan_history.dart';
 
 class HistoryScreen extends StatefulWidget {
-  const HistoryScreen({Key? key}) : super(key: key);
+  const HistoryScreen({super.key});
 
   @override
-  _HistoryScreenState createState() => _HistoryScreenState();
+  State<HistoryScreen> createState() => _HistoryScreenState();
 }
 
 class _HistoryScreenState extends State<HistoryScreen> {
@@ -44,9 +43,8 @@ class _HistoryScreenState extends State<HistoryScreen> {
           final scan = history.scans[history.scans.length - idx - 1];
           return ListTile(
             title: Text(scan.value),
-            subtitle: Text(describeEnum(scan.type) +
-                " - " +
-                (scan.valueType != null ? describeEnum(scan.valueType!) : "")),
+            subtitle: Text(
+                "${scan.type.name} - ${scan.valueType != null ? scan.valueType!.name : ""}"),
           );
         },
         separatorBuilder: (_, __) => const Divider(height: 1),
diff --git a/fast_barcode_scanner/example/lib/main.dart b/fast_barcode_scanner/example/lib/main.dart
index 994f968d..1f54c2af 100644
--- a/fast_barcode_scanner/example/lib/main.dart
+++ b/fast_barcode_scanner/example/lib/main.dart
@@ -10,7 +10,7 @@ void main() {
 }
 
 class HomeScreen extends StatefulWidget {
-  const HomeScreen({Key? key}) : super(key: key);
+  const HomeScreen({super.key});
 
   @override
   State<HomeScreen> createState() => _HomeScreenState();
@@ -30,47 +30,49 @@ class _HomeScreenState extends State<HomeScreen> {
           children: [
             ElevatedButton(
               child: const Text('Open Scanner'),
-              onPressed: () => Navigator.push(
-                context,
-                MaterialPageRoute(
-                  builder: (_) => ScanningScreen(
-                    dispose: _disposeCheckboxValue,
+              onPressed: () {
+                Navigator.push(
+                  context,
+                  MaterialPageRoute(
+                    builder: (_) =>
+                        ScanningScreen(dispose: _disposeCheckboxValue),
                   ),
-                ),
-              ),
+                );
+              },
             ),
             ElevatedButton(
               onPressed: () async {
-                final cam = CameraController();
-
                 final dialog = SimpleDialog(
                   children: [
                     SimpleDialogOption(
-                      child: const Text('Choose image'),
-                      onPressed: () => Navigator.pop(context, 1),
+                      child: const Text('Scan sample image'),
+                      onPressed: () => Navigator.pop(context, 'sample'),
                     ),
                     SimpleDialogOption(
                       child: const Text('Open Picker'),
-                      onPressed: () => Navigator.pop(context, 2),
+                      onPressed: () => Navigator.pop(context, 'picker'),
                     )
                   ],
                 );
 
-                final result = await showDialog<int>(
+                final result = await showDialog<String>(
                     context: context, builder: (_) => dialog);
 
                 final ImageSource source;
-                if (result == 1) {
+                if (result == 'sample') {
                   final bytes = await rootBundle.load('assets/barcodes.png');
                   source = ImageSource.binary(bytes);
-                } else if (result == 2) {
+                } else if (result == 'picker') {
                   source = ImageSource.picker();
                 } else {
                   return;
                 }
 
                 try {
-                  final barcodes = await cam.scanImage(source);
+                  final barcodes =
+                      await CameraController.shared.scanImage(source);
+
+                  if (!context.mounted) return;
 
                   showDialog(
                     context: context,
@@ -90,11 +92,15 @@ class _HomeScreenState extends State<HomeScreen> {
 
                       return SimpleDialog(
                         title: const Text('Result'),
-                        children: children,
+                        children: [
+                          Image.asset("assets/barcodes.png"),
+                          ...children
+                        ],
                       );
                     },
                   );
                 } catch (error, stack) {
+                  if (!context.mounted) return;
                   presentErrorAlert(context, error, stack);
                 }
               },
diff --git a/fast_barcode_scanner/example/lib/scanning_screen/scanning_overlay_config.dart b/fast_barcode_scanner/example/lib/scanning_screen/scanning_overlay_config.dart
index 579a2161..a34b6f65 100644
--- a/fast_barcode_scanner/example/lib/scanning_screen/scanning_overlay_config.dart
+++ b/fast_barcode_scanner/example/lib/scanning_screen/scanning_overlay_config.dart
@@ -7,14 +7,18 @@ enum ScanningOverlayType {
 
 class ScanningOverlayConfig {
   final List<ScanningOverlayType> availableOverlays;
-  final ScanningOverlayType? enabledOverlay;
+  final List<ScanningOverlayType> enabledOverlays;
 
-  ScanningOverlayConfig(this.availableOverlays, this.enabledOverlay);
+  ScanningOverlayConfig({
+    required this.availableOverlays,
+    required this.enabledOverlays,
+  });
 
   ScanningOverlayConfig copyWith(
-      {List<ScanningOverlayType>? availableOverlays,
-      ScanningOverlayType? enabledOverlay}) {
-    return ScanningOverlayConfig(availableOverlays ?? this.availableOverlays,
-        enabledOverlay ?? enabledOverlay);
+      {List<ScanningOverlayType>? enabledOverlays}) {
+    return ScanningOverlayConfig(
+      availableOverlays: availableOverlays,
+      enabledOverlays: enabledOverlays ?? this.enabledOverlays,
+    );
   }
 }
diff --git a/fast_barcode_scanner/example/lib/scanning_screen/scanning_screen.dart b/fast_barcode_scanner/example/lib/scanning_screen/scanning_screen.dart
index 42590b06..38d2df91 100644
--- a/fast_barcode_scanner/example/lib/scanning_screen/scanning_screen.dart
+++ b/fast_barcode_scanner/example/lib/scanning_screen/scanning_screen.dart
@@ -1,18 +1,24 @@
 import 'package:fast_barcode_scanner/fast_barcode_scanner.dart';
 import 'package:fast_barcode_scanner_example/scanning_screen/scanning_overlay_config.dart';
 import 'package:flutter/material.dart';
-import '../scan_history.dart';
+
 import '../configure_screen/configure_screen.dart';
+import '../scan_history.dart';
 import '../utils.dart';
 import 'scans_counter.dart';
 
 class ScanningScreen extends StatefulWidget {
-  const ScanningScreen({Key? key, required this.dispose}) : super(key: key);
+  const ScanningScreen({
+    super.key,
+    required this.dispose,
+    // this.appleApiMode = const AppleApiMode.avFoundation(),
+  });
 
   final bool dispose;
+  // final AppleApiMode? appleApiMode;
 
   @override
-  _ScanningScreenState createState() => _ScanningScreenState();
+  State<ScanningScreen> createState() => _ScanningScreenState();
 }
 
 class _ScanningScreenState extends State<ScanningScreen> {
@@ -34,9 +40,14 @@ class _ScanningScreenState extends State<ScanningScreen> {
     ..color = Colors.orange;
 
   ScanningOverlayConfig _scanningOverlayConfig = ScanningOverlayConfig(
-      ScanningOverlayType.values, ScanningOverlayType.codeBoundaryOverlay);
+    availableOverlays: ScanningOverlayType.values,
+    enabledOverlays: [
+      ScanningOverlayType.materialOverlay,
+      ScanningOverlayType.codeBoundaryOverlay,
+    ],
+  );
 
-  final cam = CameraController();
+  final cam = CameraController.shared;
 
   @override
   Widget build(BuildContext context) {
@@ -63,11 +74,9 @@ class _ScanningScreenState extends State<ScanningScreen> {
                       mainAxisSize: MainAxisSize.min,
                       children: [
                         Text("Texture Id: ${preview.textureId}"),
-                        Text(
-                            "Preview (WxH): ${preview.width}x${preview.height}"),
+                        Text("Preview (WxH): ${preview.width}x${preview.height}"),
                         Text("Analysis (WxH): ${preview.analysisResolution}"),
-                        Text(
-                            "Target Rotation (unused): ${preview.targetRotation}"),
+                        Text("Target Rotation (unused): ${preview.targetRotation}"),
                       ],
                     ),
                   ),
@@ -88,32 +97,39 @@ class _ScanningScreenState extends State<ScanningScreen> {
         framerate: Framerate.fps30,
         mode: DetectionMode.continuous,
         position: CameraPosition.back,
-        onScan: (code) => history.addAll(code),
+        // appleApiMode: widget.appleApiMode,
+        onScan: (code) {
+          history.addAll(code);
+        },
+        dispose: widget.dispose,
         children: [
-          if (_scanningOverlayConfig.enabledOverlay ==
-              ScanningOverlayType.materialOverlay)
-            const MaterialPreviewOverlay(),
-          if (_scanningOverlayConfig.enabledOverlay ==
-              ScanningOverlayType.codeBoundaryOverlay)
-            CodeBoundaryOverlay(
-              codeBorderPaintBuilder: (code) {
-                return code.value.hashCode % 2 == 0 ? orangePaint : greenPaint;
+          if (_scanningOverlayConfig.enabledOverlays.contains(ScanningOverlayType.materialOverlay))
+            MaterialPreviewOverlay(
+              rectOfInterest: RectOfInterest.wide(), // this can be wide or square
+              onScan: (codes) {
+                // these are codes that only appear within the finder rectangle
               },
-              codeValueDisplayBuilder: (code) {
-                return BasicBarcodeValueDisplay(
-                  text: code.value,
-                  color: code.value.hashCode % 2 == 0
-                      ? Colors.orange
-                      : Colors.green,
-                  location: CodeValueDisplayLocation.centerTop,
-                );
+              showSensing: true,
+              onScannedBoundsColor: (codes) {
+                if (codes.isNotEmpty) {
+                  return codes.first.value.hashCode % 2 == 0 ? Colors.orange : Colors.green;
+                }
+                return null;
               },
             ),
-          if (_scanningOverlayConfig.enabledOverlay ==
-              ScanningOverlayType.blurPreview)
-            const BlurPreviewOverlay()
+          // if (_scanningOverlayConfig.enabledOverlays
+          //     .contains(ScanningOverlayType.codeBoundaryOverlay))
+          //   CodeBoundaryOverlay(
+          //     codeBorderPaintBuilder: (code) {
+          //       return code.value.hashCode % 2 == 0 ? orangePaint : greenPaint;
+          //     },
+          //     barcodeValueStyle: (code) => TextStyle(
+          //       color: code.value.hashCode % 2 == 0 ? Colors.orange : Colors.green,
+          //     ),
+          //   ),
+          // if (_scanningOverlayConfig.enabledOverlays.contains(ScanningOverlayType.blurPreview))
+          //   const BlurPreviewOverlay()
         ],
-        dispose: widget.dispose,
       ),
       floatingActionButton: FloatingActionButton(
         onPressed: () {
@@ -145,21 +161,20 @@ class _ScanningScreenState extends State<ScanningScreen> {
                                 builder: (context, isRunning, _) {
                                   return ElevatedButton(
                                     onPressed: () {
-                                      final future = isRunning
-                                          ? cam.pauseCamera()
-                                          : cam.resumeCamera();
+                                      final future =
+                                          isRunning ? cam.pauseCamera() : cam.resumeCamera();
 
-                                      future
-                                          .then((_) =>
-                                              _cameraRunning.value = !isRunning)
-                                          .catchError((error, stack) {
+                                      future.then((_) {
+                                        _cameraRunning.value = !isRunning;
+                                      }).catchError((error, stack) {
                                         presentErrorAlert(
-                                            context, error, stack);
+                                          context,
+                                          error,
+                                          stack,
+                                        );
                                       });
                                     },
-                                    child: Text(isRunning
-                                        ? 'Pause Camera'
-                                        : 'Resume Camera'),
+                                    child: Text(isRunning ? 'Pause Camera' : 'Resume Camera'),
                                   );
                                 }),
                             ValueListenableBuilder<bool>(
@@ -167,39 +182,37 @@ class _ScanningScreenState extends State<ScanningScreen> {
                                 builder: (context, isRunning, _) {
                                   return ElevatedButton(
                                     onPressed: () {
-                                      final future = isRunning
-                                          ? cam.pauseScanner()
-                                          : cam.resumeScanner();
+                                      final future =
+                                          isRunning ? cam.pauseScanner() : cam.resumeScanner();
 
-                                      future
-                                          .then((_) => _scannerRunning.value =
-                                              !isRunning)
-                                          .catchError((error, stackTrace) {
+                                      future.then((_) {
+                                        _scannerRunning.value = !isRunning;
+                                      }).catchError((error, stackTrace) {
                                         presentErrorAlert(
-                                            context, error, stackTrace);
+                                          context,
+                                          error,
+                                          stackTrace,
+                                        );
                                       });
                                     },
-                                    child: Text(isRunning
-                                        ? 'Pause Scanner'
-                                        : 'Resume Scanner'),
+                                    child: Text(isRunning ? 'Pause Scanner' : 'Resume Scanner'),
                                   );
                                 }),
                             ValueListenableBuilder<bool>(
                               valueListenable: _torchIconState,
-                              builder: (context, isTorchActive, _) =>
-                                  ElevatedButton(
+                              builder: (context, isTorchActive, _) => ElevatedButton(
                                 onPressed: () {
-                                  cam
-                                      .toggleTorch()
-                                      .then((torchState) =>
-                                          _torchIconState.value = torchState)
-                                      .catchError((error, stackTrace) {
+                                  cam.toggleTorch().then((torchState) {
+                                    _torchIconState.value = torchState;
+                                  }).catchError((error, stackTrace) {
                                     presentErrorAlert(
-                                        context, error, stackTrace);
+                                      context,
+                                      error,
+                                      stackTrace,
+                                    );
                                   });
                                 },
-                                child: Text(
-                                    'Torch: ${isTorchActive ? 'on' : 'off'}'),
+                                child: Text('Torch: ${isTorchActive ? 'on' : 'off'}'),
                               ),
                             ),
                           ],
@@ -219,20 +232,17 @@ class _ScanningScreenState extends State<ScanningScreen> {
                                       builder: (_) => ConfigureScreen(
                                         config,
                                         _scanningOverlayConfig,
-                                        onOverlayConfigurationChanged:
-                                            (overlayConfig) {
+                                        onOverlayConfigurationChanged: (overlayConfig) {
                                           setState(() {
-                                            _scanningOverlayConfig =
-                                                overlayConfig;
+                                            _scanningOverlayConfig = overlayConfig;
                                           });
                                         },
                                       ),
                                     ),
                                   );
 
-                                  cam.resumeCamera().catchError((error,
-                                          stack) =>
-                                      presentErrorAlert(context, error, stack));
+                                  cam.resumeCamera().catchError(
+                                      (error, stack) => presentErrorAlert(context, error, stack));
                                 }
                               },
                               child: const Text('Update Configuration'),
diff --git a/fast_barcode_scanner/example/lib/scanning_screen/scans_counter.dart b/fast_barcode_scanner/example/lib/scanning_screen/scans_counter.dart
index 1f8adaa5..107907bd 100644
--- a/fast_barcode_scanner/example/lib/scanning_screen/scans_counter.dart
+++ b/fast_barcode_scanner/example/lib/scanning_screen/scans_counter.dart
@@ -1,15 +1,14 @@
 import 'package:fast_barcode_scanner/fast_barcode_scanner.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
 import '../history_screen/history_screen.dart';
 import '../scan_history.dart';
 
 class ScansCounter extends StatefulWidget {
-  const ScansCounter({Key? key}) : super(key: key);
+  const ScansCounter({super.key});
 
   @override
-  _ScansCounterState createState() => _ScansCounterState();
+  State<ScansCounter> createState() => _ScansCounterState();
 }
 
 class _ScansCounterState extends State<ScansCounter> {
@@ -39,7 +38,7 @@ class _ScansCounterState extends State<ScansCounter> {
         children: [
           TextButton(
               onPressed: () async {
-                final cam = CameraController();
+                final cam = CameraController.shared;
                 cam.pauseCamera();
                 await Navigator.push(context,
                     MaterialPageRoute(builder: (_) => const HistoryScreen()));
@@ -57,7 +56,7 @@ class _ScansCounterState extends State<ScansCounter> {
           Expanded(
             child: barcode != null
                 ? Text(
-                    "${history.count(barcode)}x\n${describeEnum(barcode.type)} - ${(barcode.valueType != null ? describeEnum(barcode.valueType!) : "")}: ${barcode.value}")
+                    "${history.count(barcode)}x\n${barcode.type.name} - ${(barcode.valueType != null ? barcode.valueType!.name : "")}: ${barcode.value}")
                 : const SizedBox.shrink(),
           ),
         ],
diff --git a/fast_barcode_scanner/example/pubspec.yaml b/fast_barcode_scanner/example/pubspec.yaml
index 9eeda395..093ab13d 100644
--- a/fast_barcode_scanner/example/pubspec.yaml
+++ b/fast_barcode_scanner/example/pubspec.yaml
@@ -1,9 +1,9 @@
 name: fast_barcode_scanner_example
 description: Demonstrates how to use the fast_barcode_scanner plugin.
-publish_to: 'none'
+publish_to: "none"
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: ">=3.3.4 <4.0.0"
 
 dependencies:
   flutter:
@@ -13,10 +13,14 @@ dependencies:
     path: ../
 
 dev_dependencies:
-  flutter_lints: ^1.0.4
+  flutter_lints: ^3.0.1
+  flutter_test:
+    sdk: flutter
+  integration_test:
+    sdk: flutter
 
 flutter:
   uses-material-design: true
 
   assets:
-    - assets/
\ No newline at end of file
+    - assets/
diff --git a/fast_barcode_scanner/ios/Classes/Camera.swift b/fast_barcode_scanner/ios/Classes/Camera.swift
index 514a1e9b..b26a0a4b 100644
--- a/fast_barcode_scanner/ios/Classes/Camera.swift
+++ b/fast_barcode_scanner/ios/Classes/Camera.swift
@@ -2,188 +2,205 @@ import AVFoundation
 
 class Camera: NSObject {
 
-    // MARK: Session Management
-
-    let session = AVCaptureSession()
-    private let sessionQueue = DispatchQueue(label: "fast_barcode_scanner.session.serial")
-    private var deviceInput: AVCaptureDeviceInput!
-    private var captureDevice: AVCaptureDevice { deviceInput.device }
-    private var scanner: BarcodeScanner
-
-    private(set) var configuration: ScannerConfiguration
-    private(set) var previewConfiguration: PreviewConfiguration!
-    private var torchState = false
-    private var isSessionRunning = false
-
-    init(configuration: ScannerConfiguration, scanner: BarcodeScanner) throws {
-        self.scanner = scanner
-        self.configuration = configuration
-        super.init()
-
-        var authorizationGranted = true
-        switch AVCaptureDevice.authorizationStatus(for: .video) {
-        case .authorized: break
-        case .notDetermined:
-            sessionQueue.suspend()
-            AVCaptureDevice.requestAccess(for: .video) { granted in
-                authorizationGranted = granted
-                self.sessionQueue.resume()
-            }
-        default:
-            authorizationGranted = false
-        }
-
-        try sessionQueue.sync {
-            if authorizationGranted {
-                try self.configureSession(configuration: configuration)
-                self.addObservers()
-            } else {
-                throw ScannerError.unauthorized
-            }
-        }
+  // MARK: Session Management
+
+  let session = AVCaptureSession()
+  private let sessionQueue = DispatchQueue(label: "fast_barcode_scanner.session.serial")
+  private var deviceInput: AVCaptureDeviceInput!
+  private var captureDevice: AVCaptureDevice { deviceInput.device }
+  private var scanner: BarcodeScanner
+
+  private(set) var cameraConfiguration: CameraConfiguration
+  private(set) var previewConfiguration: PreviewConfiguration!
+
+  private var wasUsingTorch = false
+
+  init(configuration: CameraConfiguration, scanner: BarcodeScanner) throws {
+    self.scanner = scanner
+    self.cameraConfiguration = configuration
+    super.init()
+
+    var authorizationGranted = true
+    switch AVCaptureDevice.authorizationStatus(for: .video) {
+    case .authorized: break
+    case .notDetermined:
+      sessionQueue.suspend()
+      AVCaptureDevice.requestAccess(for: .video) { granted in
+        authorizationGranted = granted
+        self.sessionQueue.resume()
+      }
+    default:
+      authorizationGranted = false
     }
 
-    deinit {
-        removeObservers()
+    try sessionQueue.sync {
+      if authorizationGranted {
+        try self.configureSession(configuration: configuration)
+        self.addObservers()
+      } else {
+        throw ScannerError.unauthorized
+      }
+    }
+  }
+
+  deinit {
+    removeObservers()
+  }
+
+  func configureSession(configuration: CameraConfiguration) throws {
+    let requestedDevice: AVCaptureDevice?
+
+    // Grab the requested camera device, otherwise toggle the position and try again.
+    if let device = AVCaptureDevice.default(
+      .builtInWideAngleCamera,
+      for: .video,
+      position: configuration.position)
+    {
+      requestedDevice = device
+    } else if let device = AVCaptureDevice.default(
+      .builtInWideAngleCamera,
+      for: .video,
+      position: configuration.position == .back ? .front : .back)
+    {
+      requestedDevice = device
+    } else {
+      requestedDevice = nil
     }
 
-    func configureSession(configuration: ScannerConfiguration) throws {
-        let requestedDevice: AVCaptureDevice?
-
-        // Grab the requested camera device, otherwise toggle the position and try again.
-        if let device = AVCaptureDevice.default(.builtInWideAngleCamera,
-                                                for: .video,
-                                                position: configuration.position) {
-            requestedDevice = device
-        } else if let device = AVCaptureDevice.default(.builtInWideAngleCamera,
-                                                       for: .video,
-                                                       position: configuration.position == .back ? .front : .back) {
-            requestedDevice = device
-        } else {
-            requestedDevice = nil
-        }
-
-        guard let device = requestedDevice else {
-            throw ScannerError.noInputDeviceForConfig(configuration)
-        }
-
-        session.beginConfiguration()
-
-        session.inputs.forEach(session.removeInput)
-
-        let deviceInput = try AVCaptureDeviceInput(device: device)
-
-        if session.canAddInput(deviceInput) {
-            session.addInput(deviceInput)
-            self.deviceInput = deviceInput
-        } else {
-            throw ScannerError.configurationError("Could not add video device input to session")
-        }
-
-        // Attach scanner to the session
-        self.scanner.session = session
-        self.scanner.symbologies = configuration.codes
-        self.scanner.onDetection = { [unowned self] in
-            switch configuration.detectionMode {
-            case .pauseDetection:
-                self.scanner.stop()
-            case .pauseVideo:
-                self.stop()
-            case .continuous: break
-            }
-        }
-
-        session.commitConfiguration()
-
-        // Find the optimal settings for the requested resolution and frame rate.
-        guard let optimalFormat = captureDevice.formats.first(where: {
-            let dimensions = CMVideoFormatDescriptionGetDimensions($0.formatDescription)
-            let mediaSubType = CMFormatDescriptionGetMediaSubType($0.formatDescription).toString()
-
-            return $0.videoSupportedFrameRateRanges.first!.maxFrameRate >= configuration.framerate.doubleValue
-                && dimensions.height >= configuration.resolution.height
-                && dimensions.width >= configuration.resolution.width
-                && mediaSubType == "420f" // maybe 420v is also ok? Who knows...
-        }) else {
-            throw ScannerError.cameraNotSuitable(configuration.resolution, configuration.framerate)
-        }
-
-        do {
-            try captureDevice.lockForConfiguration()
-            captureDevice.activeFormat = optimalFormat
-            captureDevice.activeVideoMaxFrameDuration =
-                optimalFormat.videoSupportedFrameRateRanges.first!.minFrameDuration
-            captureDevice.unlockForConfiguration()
-        } catch {
-            throw ScannerError.configurationError(error.localizedDescription)
-        }
-
-        let previewSize = CMVideoFormatDescriptionGetDimensions(captureDevice.activeFormat.formatDescription)
-
-        self.configuration = configuration
-
-        self.previewConfiguration = PreviewConfiguration(width: previewSize.width,
-                             height: previewSize.height,
-                             targetRotation: 0,
-                             textureId: 0)
+    guard let device = requestedDevice else {
+      throw ScannerError.noInputDeviceForConfig(configuration)
     }
 
-    func start() throws {
-        scanner.start()
-        session.startRunning()
-        isSessionRunning = session.isRunning
+    session.beginConfiguration()
 
-        if torchState {
-            try toggleTorch()
-        }
-    }
+    session.inputs.forEach(session.removeInput)
+
+    let deviceInput = try AVCaptureDeviceInput(device: device)
 
-    func stop() {
-        torchState = captureDevice.isTorchActive
-        session.stopRunning()
-        isSessionRunning = session.isRunning
+    if session.canAddInput(deviceInput) {
+      session.addInput(deviceInput)
+      self.deviceInput = deviceInput
+    } else {
+      throw ScannerError.configurationError("Could not add video device input to session")
     }
 
-    @discardableResult
-    func toggleTorch() throws -> Bool {
-        guard captureDevice.isTorchAvailable else { return false }
+    self.scanner.session = session
 
-        try captureDevice.lockForConfiguration()
-        captureDevice.torchMode = captureDevice.isTorchActive ? .off : .on
-        captureDevice.unlockForConfiguration()
+    self.scanner.symbologies = configuration.codes
+
+    self.scanner.onDetection = { [unowned self] in
+      switch configuration.detectionMode {
+      case .pauseDetection:
+        self.scanner.stop()
+      case .pauseVideo:
+        self.stop()
+      case .continuous: break
+      }
+    }
 
-        return captureDevice.torchMode == .on
+    session.commitConfiguration()
+
+    // Find the optimal settings for the requested resolution and frame rate.
+    guard
+      let optimalFormat = captureDevice.formats.first(where: {
+        let dimensions = CMVideoFormatDescriptionGetDimensions($0.formatDescription)
+        let mediaSubType = CMFormatDescriptionGetMediaSubType($0.formatDescription).toString()
+
+        return $0.videoSupportedFrameRateRanges.first!.maxFrameRate
+          >= configuration.framerate.numberValue
+          && dimensions.height >= configuration.resolution.size.width
+          && dimensions.width >= configuration.resolution.size.width
+          && mediaSubType == "420f"  // maybe 420v is also ok? Who knows...
+      })
+    else {
+      throw ScannerError.cameraNotSuitable(configuration.resolution, configuration.framerate)
     }
 
-    func startDetector() {
-        scanner.start()
+    do {
+      try captureDevice.lockForConfiguration()
+      captureDevice.activeFormat = optimalFormat
+      captureDevice.activeVideoMaxFrameDuration =
+        optimalFormat.videoSupportedFrameRateRanges.first!.minFrameDuration
+      captureDevice.unlockForConfiguration()
+    } catch {
+      throw ScannerError.configurationError(error.localizedDescription)
     }
 
-    func stopDetector() {
-        scanner.stop()
+    let previewSize = CMVideoFormatDescriptionGetDimensions(
+      captureDevice.activeFormat.formatDescription)
+
+    self.cameraConfiguration = configuration
+
+    self.previewConfiguration = PreviewConfiguration(
+      previewWidth: previewSize.width, previewHeight: previewSize.height,
+      analysisWidth: previewSize.width, analysisHeight: previewSize.height)
+  }
+
+  func start() throws {
+    guard !session.isRunning else {
+      return
     }
 
-    // MARK: KVO and Notifications
-    func addObservers() {
-        NotificationCenter.default.addObserver(self, selector: #selector(sessionRuntimeError), name: .AVCaptureSessionRuntimeError, object: session)
+    scanner.start()
+
+    self.session.startRunning()
+
+    if wasUsingTorch {
+      try toggleTorch()
     }
+  }
 
-    func removeObservers() {
-        NotificationCenter.default.removeObserver(self, name: .AVCaptureSessionRuntimeError, object: session)
+  func stop() {
+    guard session.isRunning else {
+      return
     }
 
-    // MARK: AVError handling
+    wasUsingTorch = captureDevice.isTorchActive
+
+    session.stopRunning()
+  }
+
+  @discardableResult
+  func toggleTorch() throws -> Bool {
+    guard captureDevice.isTorchAvailable else { return false }
+
+    try captureDevice.lockForConfiguration()
+    captureDevice.torchMode = captureDevice.isTorchActive ? .off : .on
+    captureDevice.unlockForConfiguration()
+
+    return captureDevice.torchMode == .on
+  }
+
+  func startDetector() {
+    scanner.start()
+  }
+
+  func stopDetector() {
+    scanner.stop()
+  }
+
+  // MARK: KVO and Notifications
+
+  func addObservers() {
+    NotificationCenter.default.addObserver(
+      self, selector: #selector(sessionRuntimeError), name: .AVCaptureSessionRuntimeError,
+      object: session)
+  }
+
+  func removeObservers() {
+    NotificationCenter.default.removeObserver(
+      self, name: .AVCaptureSessionRuntimeError, object: session)
+  }
+
+  // MARK: AVError handling
 
-    @objc
-    func sessionRuntimeError(notification: NSNotification) {
-        guard let error = notification.userInfo?[AVCaptureSessionErrorKey] as? AVError else { return }
+  @objc
+  func sessionRuntimeError(notification: NSNotification) {
+    guard let error = notification.userInfo?[AVCaptureSessionErrorKey] as? AVError else { return }
 
-        // Try to restart, if session was running
-        if error.code == .mediaServicesWereReset && isSessionRunning {
-            sessionQueue.async {
-                self.session.startRunning()
-                self.isSessionRunning = self.session.isRunning
-            }
-        }
+    // Try to restart, if session was running
+    if error.code == .mediaServicesWereReset && session.isRunning {
+      self.session.startRunning()
     }
+  }
 }
diff --git a/fast_barcode_scanner/ios/Classes/FastBarcodeScannerPlugin.swift b/fast_barcode_scanner/ios/Classes/FastBarcodeScannerPlugin.swift
index 8062f67f..e10fdb07 100644
--- a/fast_barcode_scanner/ios/Classes/FastBarcodeScannerPlugin.swift
+++ b/fast_barcode_scanner/ios/Classes/FastBarcodeScannerPlugin.swift
@@ -1,190 +1,213 @@
-import Flutter
 import AVFoundation
+import Flutter
 
 public class FastBarcodeScannerPlugin: NSObject, FlutterPlugin, FlutterStreamHandler {
-    let commandChannel: FlutterMethodChannel
-    let barcodeEventChannel: FlutterEventChannel
-    let factory: PreviewViewFactory
-
-    var camera: Camera?
-    var picker: ImagePicker?
-    var detectionsSink: FlutterEventSink?
-
-    init(commands: FlutterMethodChannel,
-         events: FlutterEventChannel,
-         factory: PreviewViewFactory
-    ) {
-		commandChannel = commands
-        barcodeEventChannel = events
-        self.factory = factory
-	}
-
-	public static func register(with registrar: FlutterPluginRegistrar) {
-		let commandChannel = FlutterMethodChannel(name: "com.jhoogstraat/fast_barcode_scanner",
-                                                  binaryMessenger: registrar.messenger())
-
-        let barcodeEventChannel = FlutterEventChannel(name: "com.jhoogstraat/fast_barcode_scanner/detections",
-                                                      binaryMessenger: registrar.messenger())
-
-        let instance = FastBarcodeScannerPlugin(commands: commandChannel,
-                                                events: barcodeEventChannel,
-                                                factory: PreviewViewFactory())
-
-        registrar.register(instance.factory, withId: "fast_barcode_scanner.preview")
-		registrar.addMethodCallDelegate(instance, channel: commandChannel)
-        barcodeEventChannel.setStreamHandler(instance)
-	}
-
-	public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
-        do {
-            var response: Any?
-
-            switch call.method {
-            case "init": response = try initialize(args: call.arguments).asDict
-            case "start": try start()
-            case "stop": try stop()
-            case "startDetector": try startDetector()
-            case "stopDetector": try stopDetector()
-            case "torch": response = try toggleTorch()
-            case "config": response = try updateConfiguration(call: call).asDict
-            case "scan": try analyzeImage(args: call.arguments, on: result); return
-            case "dispose": dispose()
-            default: response = FlutterMethodNotImplemented
-            }
-
-            result(response)
-        } catch {
-            print(error)
-            result(error.flutterError)
+  let commandChannel: FlutterMethodChannel
+  let barcodeEventChannel: FlutterEventChannel
+  let factory: PreviewViewFactory
+
+  var camera: Camera?
+  var picker: ImagePicker?
+  var detectionsSink: FlutterEventSink?
+
+  init(
+    commands: FlutterMethodChannel,
+    events: FlutterEventChannel,
+    factory: PreviewViewFactory
+  ) {
+    commandChannel = commands
+    barcodeEventChannel = events
+    self.factory = factory
+  }
+
+  public static func register(with registrar: FlutterPluginRegistrar) {
+    let commandChannel = FlutterMethodChannel(
+      name: "com.jhoogstraat/fast_barcode_scanner",
+      binaryMessenger: registrar.messenger()
+    )
+
+    let barcodeEventChannel = FlutterEventChannel(
+      name: "com.jhoogstraat/fast_barcode_scanner/detections",
+      binaryMessenger: registrar.messenger()
+    )
+
+    let instance = FastBarcodeScannerPlugin(
+      commands: commandChannel,
+      events: barcodeEventChannel,
+      factory: PreviewViewFactory()
+    )
+
+    registrar.register(instance.factory, withId: "fast_barcode_scanner.preview")
+    registrar.addMethodCallDelegate(instance, channel: commandChannel)
+    barcodeEventChannel.setStreamHandler(instance)
+  }
+
+  public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
+    Task {
+      do {
+        var response: Any?
+
+        switch call.method {
+        case "init": response = try initialize(args: call.arguments).dict
+        case "start": try await start()
+        case "stop": try stop()
+        case "startDetector": try startDetector()
+        case "stopDetector": try stopDetector()
+        case "torch": response = try toggleTorch()
+        case "config": response = try updateConfiguration(call: call).dict
+        case "scan": response = try await analyzeImage(args: call.arguments)
+        case "dispose": dispose()
+        default: response = FlutterMethodNotImplemented
         }
-	}
 
-    func initialize(args: Any?) throws -> PreviewConfiguration {
-        guard camera == nil else {
-            throw ScannerError.alreadyInitialized
-        }
+        result(response)
+      } catch {
+        print(error)
+        result(error.flutterError)
+      }
+    }
+  }
 
-        guard let configuration = ScannerConfiguration(args) else {
-            throw ScannerError.invalidArguments(args)
-        }
+  func initialize(args: Any?) throws -> PreviewConfiguration {
+    guard camera == nil else {
+      throw ScannerError.alreadyInitialized
+    }
 
-        let scanner = AVFoundationBarcodeScanner(barcodeObjectLayerConverter: { barcodes in
-            self.factory.preview?.videoPreviewLayer.transformedMetadataObject(for: barcodes) as? AVMetadataMachineReadableCodeObject
-        }) { [unowned self] barcodes in
-            detectionsSink?(barcodes)
+    guard let cameraConfiguration = CameraConfiguration(args) else {
+      throw ScannerError.invalidArguments(args)
+    }
+
+    let scanner: BarcodeScanner
+    switch cameraConfiguration.apiMode {
+    case .avFoundation:
+      scanner = AVFoundationBarcodeScanner { [unowned self] barcodes in
+        DispatchQueue.main.sync {
+          self.factory.preview?.videoPreviewLayer.transformedMetadataObject(for: barcodes)
         }
+      } resultHandler: { [unowned self] barcodes in
+        self.detectionsSink?(barcodes)
+      }
+    case .vision:
+      scanner = VisionBarcodeScanner(confidence: cameraConfiguration.confidence) { observation in
+        self.factory.preview?.videoPreviewLayer.layerRectConverted(
+          fromMetadataOutputRect: observation.boundingBox)
+      } resultHandler: { [unowned self] result in
+        detectionsSink?(result)
+      }
+    }
 
-        let camera = try Camera(configuration: configuration, scanner: scanner)
+    let camera = try Camera(configuration: cameraConfiguration, scanner: scanner)
 
-        // AVCaptureVideoPreviewLayer shows the current camera's session
-        factory.session = camera.session
+    factory.session = camera.session
 
-        try camera.start()
+    try camera.start()
 
-        self.camera = camera
+    self.camera = camera
 
-        return camera.previewConfiguration
-    }
+    return camera.previewConfiguration
+  }
 
-    func start() throws {
-        guard let camera = camera else { throw ScannerError.notInitialized }
-        try camera.start()
-	}
+  func start() async throws {
+    guard let camera = camera else {
+      throw ScannerError.notInitialized
+    }
+    try camera.start()
+  }
 
-    func stop() throws {
-        guard let camera = camera else { throw ScannerError.notInitialized }
-        camera.stop()
+  func stop() throws {
+    guard let camera = camera else {
+      throw ScannerError.notInitialized
     }
+    camera.stop()
+  }
+
+  func dispose() {
+    camera?.stop()
+    camera = nil
+  }
 
-    func dispose() {
-        camera?.stop()
-        camera = nil
+  func startDetector() throws {
+    guard let camera = camera else {
+      throw ScannerError.notInitialized
     }
+    camera.startDetector()
+  }
 
-    func startDetector() throws {
-        guard let camera = camera else { throw ScannerError.notInitialized }
-        camera.startDetector()
+  func stopDetector() throws {
+    guard let camera = camera else {
+      throw ScannerError.notInitialized
     }
+    camera.stopDetector()
+  }
 
-    func stopDetector() throws {
-        guard let camera = camera else { throw ScannerError.notInitialized }
-        camera.stopDetector()
+  func toggleTorch() throws -> Bool {
+    guard let camera = camera else {
+      throw ScannerError.notInitialized
     }
+    return try camera.toggleTorch()
+  }
 
-	func toggleTorch() throws -> Bool {
-        guard let camera = camera else { throw ScannerError.notInitialized }
-        return try camera.toggleTorch()
-	}
+  func updateConfiguration(call: FlutterMethodCall) throws -> PreviewConfiguration {
+    guard let camera = camera else {
+      throw ScannerError.notInitialized
+    }
 
-    func updateConfiguration(call: FlutterMethodCall) throws -> PreviewConfiguration {
-        guard let camera = camera else {
-            throw ScannerError.notInitialized
-        }
+    guard let config = camera.cameraConfiguration.copy(with: call.arguments) else {
+      throw ScannerError.invalidArguments(call.arguments)
+    }
 
-        guard let config = camera.configuration.copy(with: call.arguments) else {
-            throw ScannerError.invalidArguments(call.arguments)
-        }
+    try camera.configureSession(configuration: config)
 
-        try camera.configureSession(configuration: config)
+    return camera.previewConfiguration
+  }
 
-        return camera.previewConfiguration
-    }
+  func analyzeImage(args: Any?) async throws -> Any? {
+    let image: UIImage?
 
-    func analyzeImage(args: Any?, on resultHandler: @escaping (Any?) -> Void) throws {
-        guard #available(iOS 11, *) else {
-            throw ScannerError.minimumTarget
-        }
+    if let container = args as? [Any] {
+      guard
+        let byteBuffer = container[0] as? FlutterStandardTypedData
+      else {
+        throw ScannerError.loadingDataFailed
+      }
 
-        let visionResultHandler: BarcodeScanner.ResultHandler = { result in
-            resultHandler(result)
-        }
+      image = UIImage(data: byteBuffer.data)
+    } else {
+      guard let root = await UIApplication.shared.delegate?.window??.rootViewController else {
+        return nil
+      }
 
-        if let container = args as? [Any] {
-            guard
-                let byteBuffer = container[0] as? FlutterStandardTypedData,
-                let image = UIImage(data: byteBuffer.data),
-                let cgImage = image.cgImage
-            else {
-                throw ScannerError.loadingDataFailed
-            }
-
-            let scanner = VisionBarcodeScanner(resultHandler: visionResultHandler)
-            scanner.process(cgImage)
-        } else {
-            guard
-                let root = UIApplication.shared.delegate?.window??.rootViewController
-            else {
-                return resultHandler(nil)
-            }
-
-            let imagePickerResultHandler: ImagePicker.ResultHandler = { [weak self] image in
-                guard let uiImage = image,
-                      let cgImage = uiImage.cgImage
-                else { return resultHandler(nil) }
-
-                self?.picker = nil
-                let scanner = VisionBarcodeScanner(resultHandler: visionResultHandler)
-                scanner.process(cgImage)
-            }
-
-            if #available(iOS 14, *) {
-                picker = PHImagePicker(resultHandler: imagePickerResultHandler)
-            } else {
-                picker = UIImagePicker(resultHandler: imagePickerResultHandler)
-            }
-
-            picker!.show(over: root)
-        }
+      let picker: ImagePicker
+      if #available(iOS 14, *) {
+        picker = await PHImagePicker()
+      } else {
+        picker = await UIImagePicker()
+      }
 
+      image = await picker.show(over: root)
     }
 
-    public func onListen(withArguments arguments: Any?, eventSink events: @escaping FlutterEventSink) -> FlutterError? {
-        detectionsSink = events
-        return nil
+    guard let uiImage = image,
+      let cgImage = uiImage.cgImage
+    else {
+      throw ScannerError.loadingDataFailed
     }
 
-    public func onCancel(withArguments arguments: Any?) -> FlutterError? {
-        detectionsSink = nil
-        return nil
+    return await withCheckedContinuation { continuation in
+      let scanner = VisionBarcodeScanner(confidence: 0.6, resultHandler: continuation.resume)
+      scanner.process(cgImage)
     }
+  }
+
+  public func onListen(withArguments arguments: Any?, eventSink events: @escaping FlutterEventSink)
+    -> FlutterError?
+  {
+    detectionsSink = events
+    return nil
+  }
+
+  public func onCancel(withArguments arguments: Any?) -> FlutterError? {
+    detectionsSink = nil
+    return nil
+  }
 }
diff --git a/fast_barcode_scanner/ios/Classes/ImagePicker.swift b/fast_barcode_scanner/ios/Classes/ImagePicker.swift
index 25977b3d..b0eefc61 100644
--- a/fast_barcode_scanner/ios/Classes/ImagePicker.swift
+++ b/fast_barcode_scanner/ios/Classes/ImagePicker.swift
@@ -1,74 +1,85 @@
 import PhotosUI
 
+@MainActor
 protocol ImagePicker {
-    typealias ResultHandler = (UIImage?) -> Void
-
-    var resultHandler: ResultHandler { get }
-
-    func show(over viewController: UIViewController)
+  func show(over viewController: UIViewController) async -> UIImage?
 }
 
 @available(iOS 14, *)
 class PHImagePicker: ImagePicker, PHPickerViewControllerDelegate {
 
-    let resultHandler: ResultHandler
-
-    init(resultHandler: @escaping ResultHandler) {
-        self.resultHandler = resultHandler
-    }
-
-    func show(over viewController: UIViewController) {
-        var configuration = PHPickerConfiguration(photoLibrary: .shared())
-        configuration.filter = .images
-        configuration.preferredAssetRepresentationMode = .current
-
-        let picker = PHPickerViewController(configuration: configuration)
-        picker.delegate = self
-        viewController.present(picker, animated: true)
-    }
-
-    func picker(_ picker: PHPickerViewController, didFinishPicking results: [PHPickerResult]) {
-        picker.dismiss(animated: true)
+  private var continuation: CheckedContinuation<UIImage?, Never>?
 
-        guard let itemProvider = results.first?.itemProvider,
-           itemProvider.canLoadObject(ofClass: UIImage.self) else {
-            resultHandler(nil)
-            return
-        }
+  func show(over viewController: UIViewController) async -> UIImage? {
+    var configuration = PHPickerConfiguration(photoLibrary: .shared())
+    configuration.filter = .images
+    configuration.preferredAssetRepresentationMode = .current
 
-        itemProvider.loadObject(ofClass: UIImage.self) { object, error in
-            guard error == nil else {
-                print("Error loading object \(error!)")
-                self.resultHandler(nil)
-                return
-            }
+    let picker = PHPickerViewController(configuration: configuration)
+    picker.delegate = self
 
-            self.resultHandler(object as? UIImage)
-        }
+    return await withCheckedContinuation { continuation in
+      self.continuation = continuation
+      viewController.present(picker, animated: true)
     }
-}
-
-class UIImagePicker: NSObject, ImagePicker, UIImagePickerControllerDelegate, UINavigationControllerDelegate {
-
-    init(resultHandler: @escaping ResultHandler) {
-        self.resultHandler = resultHandler
+  }
+
+  func show(over viewController: UIViewController) {
+    var configuration = PHPickerConfiguration(photoLibrary: .shared())
+    configuration.filter = .images
+    configuration.preferredAssetRepresentationMode = .current
+
+    let picker = PHPickerViewController(configuration: configuration)
+    picker.delegate = self
+    viewController.present(picker, animated: true)
+  }
+
+  func picker(_ picker: PHPickerViewController, didFinishPicking results: [PHPickerResult]) {
+    picker.dismiss(animated: true)
+
+    guard let itemProvider = results.first?.itemProvider,
+      itemProvider.canLoadObject(ofClass: UIImage.self)
+    else {
+      continuation?.resume(returning: nil)
+      return
     }
 
-    var resultHandler: ResultHandler
+    itemProvider.loadObject(ofClass: UIImage.self) { object, error in
+      guard error == nil else {
+        print("Error loading object \(error!)")
+        self.continuation?.resume(returning: nil)
+        return
+      }
 
-    func show(over viewController: UIViewController) {
-        let picker = UIImagePickerController()
-        picker.delegate = self
-        viewController.present(picker, animated: true)
-    }
-
-    func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey: Any]) {
-        picker.dismiss(animated: true)
-        resultHandler(info[.originalImage] as? UIImage)
+      self.continuation?.resume(returning: object as? UIImage)
     }
+  }
+}
 
-    func imagePickerControllerDidCancel(_ picker: UIImagePickerController) {
-        picker.dismiss(animated: true)
-        resultHandler(nil)
+class UIImagePicker: NSObject, ImagePicker, UIImagePickerControllerDelegate,
+  UINavigationControllerDelegate
+{
+  private var continuation: CheckedContinuation<UIImage?, Never>?
+
+  func show(over viewController: UIViewController) async -> UIImage? {
+    let picker = UIImagePickerController()
+    picker.delegate = self
+    return await withCheckedContinuation { continuation in
+      self.continuation = continuation
+      viewController.present(picker, animated: true)
     }
+  }
+
+  func imagePickerController(
+    _ picker: UIImagePickerController,
+    didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey: Any]
+  ) {
+    picker.dismiss(animated: true)
+    continuation?.resume(returning: info[.originalImage] as? UIImage)
+  }
+
+  func imagePickerControllerDidCancel(_ picker: UIImagePickerController) {
+    picker.dismiss(animated: true)
+    continuation?.resume(returning: nil)
+  }
 }
diff --git a/fast_barcode_scanner/ios/Classes/PreviewView.swift b/fast_barcode_scanner/ios/Classes/PreviewView.swift
index 7dceef01..efb1540b 100644
--- a/fast_barcode_scanner/ios/Classes/PreviewView.swift
+++ b/fast_barcode_scanner/ios/Classes/PreviewView.swift
@@ -9,28 +9,28 @@ import AVFoundation
 import Flutter
 
 class PreviewView: UIView, FlutterPlatformView {
-    func view() -> UIView {
-        self
-    }
-
-    // MARK: AVFoundation session
-    var session: AVCaptureSession? {
-        get {
-            videoPreviewLayer.session
-        }
+  func view() -> UIView {
+    self
+  }
 
-        set {
-            videoPreviewLayer.session = newValue
-        }
+  // MARK: AVFoundation session
+  var session: AVCaptureSession? {
+    get {
+      videoPreviewLayer.session
     }
 
-    var videoPreviewLayer: AVCaptureVideoPreviewLayer {
-        (layer as! AVCaptureVideoPreviewLayer)
+    set {
+      videoPreviewLayer.session = newValue
     }
+  }
 
-    // MARK: UIView
-    override class var layerClass: AnyClass {
-        AVCaptureVideoPreviewLayer.self
-    }
+  var videoPreviewLayer: AVCaptureVideoPreviewLayer {
+    (layer as! AVCaptureVideoPreviewLayer)
+  }
+
+  // MARK: UIView
+  override class var layerClass: AnyClass {
+    AVCaptureVideoPreviewLayer.self
+  }
 
 }
diff --git a/fast_barcode_scanner/ios/Classes/Protocols/BarcodeScanner.swift b/fast_barcode_scanner/ios/Classes/Protocols/BarcodeScanner.swift
index d2a90811..369f5e87 100644
--- a/fast_barcode_scanner/ios/Classes/Protocols/BarcodeScanner.swift
+++ b/fast_barcode_scanner/ios/Classes/Protocols/BarcodeScanner.swift
@@ -1,15 +1,19 @@
 import AVFoundation
+import Flutter
 
 protocol BarcodeScanner {
-    typealias ResultHandler = (Any?) -> Void
 
-    var session: AVCaptureSession? { get set }
+  /// Either a serialized list of barcodes or a `FlutterError`
+  /// Serialization format: [type, value, valueType, minX, minY, maxX, maxY]
+  typealias ResultHandler = (Any?) -> Void
 
-    var symbologies: [String] { get set }
+  var session: AVCaptureSession? { get set }
 
-    var onDetection: (() -> Void)? { get set }
+  var symbologies: [String] { get set }
 
-    func start()
+  var onDetection: (() -> Void)? { get set }
 
-    func stop()
+  func start()
+
+  func stop()
 }
diff --git a/fast_barcode_scanner/ios/Classes/Scanner/AVFoundationBarcodeScanner.swift b/fast_barcode_scanner/ios/Classes/Scanner/AVFoundationBarcodeScanner.swift
index 2ccb1b49..b4a7a372 100644
--- a/fast_barcode_scanner/ios/Classes/Scanner/AVFoundationBarcodeScanner.swift
+++ b/fast_barcode_scanner/ios/Classes/Scanner/AVFoundationBarcodeScanner.swift
@@ -1,117 +1,107 @@
 import AVFoundation
 
-typealias BarcodeMetadataConverter = (AVMetadataObject) -> AVMetadataMachineReadableCodeObject?
+typealias AVMetadataObjectBoundsConverter = (AVMetadataObject) -> AVMetadataObject?
 
 class AVFoundationBarcodeScanner: NSObject, BarcodeScanner, AVCaptureMetadataOutputObjectsDelegate {
-    typealias Barcode = AVMetadataMachineReadableCodeObject
 
-    init(barcodeObjectLayerConverter: @escaping BarcodeMetadataConverter, resultHandler: @escaping ResultHandler) {
-        self.resultHandler = resultHandler
-        self.barcodeMetadataConverter = barcodeObjectLayerConverter
+  init(
+    objectBoundsConverter: @escaping AVMetadataObjectBoundsConverter,
+    resultHandler: @escaping ResultHandler
+  ) {
+    self.resultHandler = resultHandler
+    self.objectBoundsConverter = objectBoundsConverter
+  }
+
+  var resultHandler: ResultHandler
+
+  var objectBoundsConverter: AVMetadataObjectBoundsConverter
+
+  var onDetection: (() -> Void)?
+
+  private let output = AVCaptureMetadataOutput()
+  private let metadataQueue = DispatchQueue(
+    label: "fast_barcode_scanner.avfoundation_scanner.serial")
+  private var _session: AVCaptureSession?
+  private var _symbologies = [String]()
+  private var isPaused = false
+
+  var symbologies: [String] {
+    get { _symbologies }
+    set {
+      _symbologies = newValue
+
+      // This will just ignore all unsupported types
+      output.metadataObjectTypes = newValue.compactMap { avMetadataObjectTypes[$0] }
+
+      // UPC-A is reported as EAN-13
+      if newValue.contains("upcA") && !output.metadataObjectTypes.contains(.ean13) {
+        output.metadataObjectTypes.append(.ean13)
+      }
+
+      // Report to the user if any types are not supported
+      if output.metadataObjectTypes.count != newValue.count {
+        let unsupportedTypes = newValue.filter { avMetadataObjectTypes[$0] == nil }
+        print("WARNING: Unsupported barcode types selected: \(unsupportedTypes)")
+      }
     }
-
-    // Detections are handled by this function.
-    var resultHandler: ResultHandler
-
-    // metadata objects (barcodes) returned by AVFoundation are measured within the context of the VideoPreviewLayer
-    // before some of the metadata can be used (like the location of the object's corner points), it must be converted by that layer
-    // in order to decouple this class from the view, we need the plugin to provide a function in which to process these
-    // objects with the videoPreviewLayer reference
-    var barcodeMetadataConverter: BarcodeMetadataConverter
-
-    // Acts as an "on detection notifier"
-    // for the Camera.
-    var onDetection: (() -> Void)?
-
-    private let output = AVCaptureMetadataOutput()
-    private let metadataQueue = DispatchQueue(label: "fast_barcode_scanner.avfoundation_scanner.serial")
-    private var _session: AVCaptureSession?
-    private var _symbologies = [String]()
-    private var isPaused = false
-
-    var symbologies: [String] {
-        get { _symbologies }
-        set {
-            _symbologies = newValue
-
-            // This will just ignore all unsupported types
-            output.metadataObjectTypes = newValue.compactMap { avMetadataObjectTypes[$0] }
-
-            // UPC-A is reported as EAN-13
-            if newValue.contains("upcA") && !output.metadataObjectTypes.contains(.ean13) {
-                output.metadataObjectTypes.append(.ean13)
-            }
-
-            // Report to the user if any types are not supported
-            if output.metadataObjectTypes.count != newValue.count {
-                let unsupportedTypes = newValue.filter { avMetadataObjectTypes[$0] == nil }
-                print("WARNING: Unsupported barcode types selected: \(unsupportedTypes)")
-            }
-        }
+  }
+
+  var session: AVCaptureSession? {
+    get { _session }
+    set {
+      _session = newValue
+      if let session = newValue, session.canAddOutput(output), !session.outputs.contains(output) {
+        session.addOutput(output)
+      }
     }
-
-    var session: AVCaptureSession? {
-        get { _session }
-        set {
-            _session = newValue
-            if let session = newValue, session.canAddOutput(output), !session.outputs.contains(output) {
-                session.addOutput(output)
-            }
+  }
+
+  func start() {
+    output.setMetadataObjectsDelegate(self, queue: metadataQueue)
+  }
+
+  func stop() {
+    output.setMetadataObjectsDelegate(nil, queue: nil)
+  }
+
+  func metadataOutput(
+    _ output: AVCaptureMetadataOutput,
+    didOutput metadataObjects: [AVMetadataObject],
+    from connection: AVCaptureConnection
+  ) {
+
+    var scannedCodes: [[Any?]] = []
+
+    for metadata in metadataObjects {
+      guard
+        let readableCode = metadata as? AVMetadataMachineReadableCodeObject,
+        var type = flutterMetadataObjectTypes[readableCode.type],
+        var value = readableCode.stringValue,
+        let boundingBox = DispatchQueue.main.sync(execute: {
+          objectBoundsConverter(readableCode)?.bounds
+        })
+      else { continue }
+
+      // Fix UPC-A, see https://developer.apple.com/library/archive/technotes/tn2325/_index.html#//apple_ref/doc/uid/DTS40013824-CH1-IS_UPC_A_SUPPORTED_
+      if readableCode.type == .ean13 {
+        if value.hasPrefix("0") {
+          // UPC-A
+          guard symbologies.contains("upcA") else { continue }
+          type = "upcA"
+          value.removeFirst()
+        } else {
+          // EAN-13
+          guard symbologies.contains(type) else { continue }
         }
-    }
-
-    func start() {
-        output.setMetadataObjectsDelegate(self, queue: metadataQueue)
-    }
+      }
 
-    func stop() {
-        output.setMetadataObjectsDelegate(nil, queue: nil)
+      scannedCodes.append([
+        type, value, nil, boundingBox.minX, boundingBox.minY, boundingBox.maxX, boundingBox.maxY,
+      ])
     }
 
-    func metadataOutput(_ output: AVCaptureMetadataOutput,
-                        didOutput metadataObjects: [AVMetadataObject],
-                        from connection: AVCaptureConnection) {
-
-        var scannedCodes: [[Any?]] = []
-        for metadata in metadataObjects {
-            guard
-                let readableCode = metadata as? AVMetadataMachineReadableCodeObject,
-                var type = flutterMetadataObjectTypes[readableCode.type],
-                var value = readableCode.stringValue
-            else { continue }
-            let transformedCode = barcodeMetadataConverter(readableCode)
-
-            // Fix UPC-A, see https://developer.apple.com/library/archive/technotes/tn2325/_index.html#//apple_ref/doc/uid/DTS40013824-CH1-IS_UPC_A_SUPPORTED_
-            if readableCode.type == .ean13 {
-                if value.hasPrefix("0") {
-                    // UPC-A
-                    guard symbologies.contains("upcA") else { continue }
-                    type = "upcA"
-                    value.removeFirst()
-                } else {
-                    // EAN-13
-                    guard symbologies.contains(type) else { continue }
-                }
-            }
-            scannedCodes.append([type, value, nil, transformedCode?.corners.pointList])
-        }
-
-        onDetection?()
-
-        resultHandler(scannedCodes)
-	}
-}
+    onDetection?()
 
-extension Array where Element == CGPoint {
-    // convert bounding Rect to point list
-    var pointList: [[Int]] {
-        get {
-            [
-                [Int(self[0].x), Int(self[0].y)],
-                [Int(self[1].x), Int(self[1].y)],
-                [Int(self[2].x), Int(self[2].y)],
-                [Int(self[3].x), Int(self[3].y)]
-            ]
-        }
-    }
+    resultHandler(scannedCodes)
+  }
 }
diff --git a/fast_barcode_scanner/ios/Classes/Scanner/VisionBarcodeScanner.swift b/fast_barcode_scanner/ios/Classes/Scanner/VisionBarcodeScanner.swift
index b72983df..e6d560f3 100644
--- a/fast_barcode_scanner/ios/Classes/Scanner/VisionBarcodeScanner.swift
+++ b/fast_barcode_scanner/ios/Classes/Scanner/VisionBarcodeScanner.swift
@@ -1,112 +1,153 @@
 import AVFoundation
+import Flutter
 import Vision
 
-@available(iOS 11.0, *)
-class VisionBarcodeScanner: NSObject, BarcodeScanner, AVCaptureVideoDataOutputSampleBufferDelegate {
-    typealias Barcode = VNBarcodeObservation
-
-    var resultHandler: ResultHandler
-    var onDetection: (() -> Void)?
-
-    private let output = AVCaptureVideoDataOutput()
-    private let outputQueue = DispatchQueue(label: "fast_barcode_scanner.data.serial", qos: .userInitiated,
-                                                     attributes: [], autoreleaseFrequency: .workItem)
-    private lazy var visionBarcodesRequests: [VNDetectBarcodesRequest]! = {
-        let request = VNDetectBarcodesRequest(completionHandler: handleVisionRequestUpdate)
-        if #available(iOS 15, *) {
-            request.revision = VNDetectBarcodesRequestRevision2
-        }
-        return [request]
-    }()
+typealias VisionBarcodeCornerPointConverter = (VNBarcodeObservation) -> CGRect?
 
-    private let visionSequenceHandler = VNSequenceRequestHandler()
+class VisionBarcodeScanner: NSObject, BarcodeScanner, AVCaptureVideoDataOutputSampleBufferDelegate {
+  var resultHandler: ResultHandler
+  var cornerPointConverter: VisionBarcodeCornerPointConverter?
+  var confidence: Float
+  var onDetection: (() -> Void)?
+
+  private let output = AVCaptureVideoDataOutput()
+  private let outputQueue = DispatchQueue(
+    label: "fast_barcode_scanner.data.serial", qos: .userInitiated,
+    attributes: [], autoreleaseFrequency: .workItem)
+
+  private let visionSequenceHandler = VNSequenceRequestHandler()
+  private lazy var visionBarcodesRequests: [VNDetectBarcodesRequest]! = {
+    let request = VNDetectBarcodesRequest(completionHandler: handleVisionRequestUpdate)
+
+    if #available(iOS 17, *) {
+      request.revision = VNDetectBarcodesRequestRevision4
+    } else if #available(iOS 16, *) {
+      request.revision = VNDetectBarcodesRequestRevision3
+    } else if #available(iOS 15, *) {
+      request.revision = VNDetectBarcodesRequestRevision2
+    }
 
-    private var _session: AVCaptureSession?
-    private var _symbologies = [String]()
+    return [request]
+  }()
 
-    var symbologies: [String] {
-        get { _symbologies }
-        set {
-            _symbologies = newValue
+  private var _symbologies = [String]()
+  var symbologies: [String] {
+    get {
+      _symbologies
+    }
+    set {
+      _symbologies = newValue
 
-            // This will just ignore all unsupported types
-            visionBarcodesRequests.first!.symbologies = newValue.compactMap({ vnBarcodeSymbols[$0] })
+      // This will just ignore all unsupported types
+      visionBarcodesRequests.first!.symbologies = newValue.compactMap({ vnBarcodeSymbols[$0] })
 
-            // UPC-A is reported as EAN-13
-            if newValue.contains("upcA") && !visionBarcodesRequests.first!.symbologies.contains(.EAN13) {
-                visionBarcodesRequests.first!.symbologies.append(.EAN13)
-            }
+      // UPC-A is reported as EAN-13
+      if newValue.contains("upcA") && !visionBarcodesRequests.first!.symbologies.contains(.EAN13) {
+        visionBarcodesRequests.first!.symbologies.append(.EAN13)
+      }
 
-            // Report to the user if any types are not supported
-            if visionBarcodesRequests.first!.symbologies.count != newValue.count {
-                let unsupportedTypes = newValue.filter { vnBarcodeSymbols[$0] == nil }
-                print("WARNING: Unsupported barcode types selected: \(unsupportedTypes)")
-            }
+      // Report to the user if any types are not supported
+      if visionBarcodesRequests.first!.symbologies.count != newValue.count {
+        let unsupportedTypes = newValue.filter {
+          vnBarcodeSymbols[$0] == nil
         }
-    }
 
-    var session: AVCaptureSession? {
-        get { _session }
-        set {
-            _session = newValue
-            if let session = newValue, session.canAddOutput(output), !session.outputs.contains(output) {
-                session.addOutput(output)
-            }
-        }
+        print("WARNING: Unsupported barcode types selected: \(unsupportedTypes)")
+      }
     }
+  }
 
-    init(resultHandler: @escaping ResultHandler) {
-        self.resultHandler = resultHandler
-        super.init()
-
-        self.output.alwaysDiscardsLateVideoFrames = true
+  private var _session: AVCaptureSession?
+  var session: AVCaptureSession? {
+    get {
+      _session
     }
-
-    func start() {
-        output.setSampleBufferDelegate(self, queue: outputQueue)
+    set {
+      _session = newValue
+      if let session = newValue, session.canAddOutput(output), !session.outputs.contains(output) {
+        session.addOutput(output)
+      }
     }
-
-    func stop() {
-        output.setSampleBufferDelegate(nil, queue: nil)
+  }
+
+  init(
+    confidence: Float, cornerPointConverter: VisionBarcodeCornerPointConverter? = nil,
+    resultHandler: @escaping ResultHandler
+  ) {
+    self.cornerPointConverter = cornerPointConverter
+    self.confidence = confidence
+    self.resultHandler = resultHandler
+
+    super.init()
+
+    output.alwaysDiscardsLateVideoFrames = true
+  }
+
+  func start() {
+    output.setSampleBufferDelegate(self, queue: outputQueue)
+  }
+
+  func stop() {
+    output.setSampleBufferDelegate(nil, queue: nil)
+  }
+
+  // MARK: Vision capture output
+
+  func captureOutput(
+    _ output: AVCaptureOutput, didOutput sampleBuffer: CMSampleBuffer,
+    from connection: AVCaptureConnection
+  ) {
+    if let pixelBuffer = CMSampleBufferGetImageBuffer(sampleBuffer) {
+      do {
+        try visionSequenceHandler.perform(visionBarcodesRequests, on: pixelBuffer)
+      } catch {
+        handleVisionRequestUpdate(request: nil, error: error)
+      }
     }
+  }
 
-    // MARK: AVFoundation capture output
+  // MARK: Still image processing
 
-    func captureOutput(_ output: AVCaptureOutput, didOutput sampleBuffer: CMSampleBuffer, from connection: AVCaptureConnection) {
-        if let pixelBuffer = CMSampleBufferGetImageBuffer(sampleBuffer) {
-            do {
-                try visionSequenceHandler.perform(visionBarcodesRequests, on: pixelBuffer)
-            } catch {
-                handleVisionRequestUpdate(request: nil, error: error)
-            }
-        }
+  func process(_ cgImage: CGImage) {
+    do {
+      try visionSequenceHandler.perform(visionBarcodesRequests, on: cgImage)
+    } catch {
+      handleVisionRequestUpdate(request: nil, error: error)
     }
-
-    // MARK: Still image processing
-
-    func process(_ cgImage: CGImage) {
-        do {
-            try visionSequenceHandler.perform(visionBarcodesRequests, on: cgImage)
-        } catch {
-            handleVisionRequestUpdate(request: nil, error: error)
-        }
+  }
+
+  // MARK: Callback
+
+  private func handleVisionRequestUpdate(request: VNRequest?, error: Error?) {
+    guard let results = request?.results as? [VNBarcodeObservation] else {
+      let message = error != nil ? "\(error!)" : "unknownError"
+      print("Error scanning image: \(message)")
+      let flutterError = FlutterError(
+        code: "UNEXPECTED_SCAN_ERROR", message: message, details: error?._code)
+      resultHandler(flutterError)
+      return
     }
 
-    // MARK: Callback
-
-    // Currently returns all detections with a confidence > 0.8
-    private func handleVisionRequestUpdate(request: VNRequest?, error: Error?) {
-        guard let results = request?.results as? [VNBarcodeObservation] else {
-            print("Error scanning image: \(String(describing: error))")
-            resultHandler(error)
-            return
+    var unique = Set<String>()
+    let barcodes =
+      results
+      .filter { $0.confidence > confidence && $0.payloadStringValue != nil }
+      // consolidate any duplicate scans. Code128 has been observed to produce multiple scans
+      .filter { unique.insert($0.symbology.rawValue + $0.payloadStringValue!).inserted }
+      .map { observation in
+        let boundingBox = DispatchQueue.main.sync {
+          cornerPointConverter?(observation) ?? observation.boundingBox
         }
 
-        let barcodes: [Any] = results.filter { $0.confidence > 0.8 }.map {
-            return [flutterVNSymbols[$0.symbology]!, $0.payloadStringValue ?? ""]
-        }
+        return [
+          flutterVNSymbols[observation.symbology]!, observation.payloadStringValue!, nil,
+          boundingBox.minX,
+          boundingBox.minY, boundingBox.maxX, boundingBox.maxY,
+        ]
+      }
 
-        onDetection?()
-        resultHandler(barcodes)
-    }
+    onDetection?()
+
+    resultHandler(barcodes)
+  }
 }
diff --git a/fast_barcode_scanner/ios/Classes/Utilities/FourCharCode+String.swift b/fast_barcode_scanner/ios/Classes/Utilities/FourCharCode+String.swift
index f78bd5ba..aeb972f9 100644
--- a/fast_barcode_scanner/ios/Classes/Utilities/FourCharCode+String.swift
+++ b/fast_barcode_scanner/ios/Classes/Utilities/FourCharCode+String.swift
@@ -1,13 +1,13 @@
 import Foundation
 
 extension FourCharCode {
-    func toString() -> String {
-        String(cString: [
-            CChar(self >> 24 & 0xFF),
-            CChar(self >> 16 & 0xFF),
-            CChar(self >> 8 & 0xFF),
-            CChar(self & 0xFF),
-            0
-        ])
-    }
+  func toString() -> String {
+    String(cString: [
+      CChar(self >> 24 & 0xFF),
+      CChar(self >> 16 & 0xFF),
+      CChar(self >> 8 & 0xFF),
+      CChar(self & 0xFF),
+      0,
+    ])
+  }
 }
diff --git a/fast_barcode_scanner/ios/Classes/Utilities/PreviewViewFactory.swift b/fast_barcode_scanner/ios/Classes/Utilities/PreviewViewFactory.swift
index e08ac609..3eac43ba 100644
--- a/fast_barcode_scanner/ios/Classes/Utilities/PreviewViewFactory.swift
+++ b/fast_barcode_scanner/ios/Classes/Utilities/PreviewViewFactory.swift
@@ -1,15 +1,17 @@
-import Flutter
 import AVFoundation
+import Flutter
 
 class PreviewViewFactory: NSObject, FlutterPlatformViewFactory {
-    var session: AVCaptureSession?
+  var session: AVCaptureSession?
 
-    var preview: PreviewView?
+  var preview: PreviewView?
 
-    func create(withFrame frame: CGRect, viewIdentifier viewId: Int64, arguments args: Any?) -> FlutterPlatformView {
-        let view = PreviewView(frame: frame)
-        view.session = session
-        preview = view
-        return view
-    }
+  func create(withFrame frame: CGRect, viewIdentifier viewId: Int64, arguments args: Any?)
+    -> FlutterPlatformView
+  {
+    let view = PreviewView(frame: frame)
+    view.session = session
+    preview = view
+    return view
+  }
 }
diff --git a/fast_barcode_scanner/ios/Classes/types/CameraConfiguration.swift b/fast_barcode_scanner/ios/Classes/types/CameraConfiguration.swift
new file mode 100644
index 00000000..8d4dba74
--- /dev/null
+++ b/fast_barcode_scanner/ios/Classes/types/CameraConfiguration.swift
@@ -0,0 +1,156 @@
+import AVFoundation
+import Vision
+
+struct CameraConfiguration {
+
+  init(
+    position: AVCaptureDevice.Position,
+    framerate: Framerate,
+    resolution: Resolution,
+    mode: DetectionMode,
+    codes: [String],
+    apiMode: ApiMode = ApiMode.avFoundation,
+    confidence: Float = 0.6
+  ) {
+    self.position = position
+    self.framerate = framerate
+    self.resolution = resolution
+    detectionMode = mode
+    self.codes = codes
+    self.apiMode = apiMode
+    self.confidence = confidence
+  }
+
+  init?(_ args: Any?) {
+    guard
+      let dict = args as? [String: Any],
+      let position = cameraPositions[dict["pos"] as? String ?? ""],
+      let resolution = Resolution(rawValue: dict["res"] as? String ?? ""),
+      let framerate = Framerate(rawValue: dict["fps"] as? String ?? ""),
+      let detectionMode = DetectionMode(rawValue: dict["mode"] as? String ?? ""),
+      let codes = dict["types"] as? [String],
+      let apiMode = ApiMode(rawValue: dict["apiMode"] as? String ?? "")
+    else {
+      return nil
+    }
+
+    // TODO: Make confidence configurable as part of the chosen scanner
+    let confidence = dict["confidence"] as? Float ?? 0.6
+
+    self.init(
+      position: position,
+      framerate: framerate,
+      resolution: resolution,
+      mode: detectionMode,
+      codes: codes,
+      apiMode: apiMode,
+      confidence: confidence
+    )
+  }
+
+  let position: AVCaptureDevice.Position
+  let framerate: Framerate
+  let resolution: Resolution
+  let detectionMode: DetectionMode
+  let codes: [String]
+  let apiMode: ApiMode
+  let confidence: Float
+
+  func copy(with args: Any?) -> CameraConfiguration? {
+    guard let dict = args as? [String: Any] else {
+      return nil
+    }
+
+    return CameraConfiguration.init(
+      position: cameraPositions[dict["pos"] as? String ?? ""] ?? position,
+      framerate: Framerate(rawValue: dict["fps"] as? String ?? "") ?? framerate,
+      resolution: Resolution(rawValue: dict["res"] as? String ?? "") ?? resolution,
+      mode: DetectionMode(rawValue: dict["mode"] as? String ?? "") ?? detectionMode,
+      codes: dict["types"] as? [String] ?? codes,
+      apiMode: ApiMode(rawValue: dict["apiMode"] as? String ?? "") ?? apiMode,
+      confidence: dict["confidence"] as? Float ?? confidence
+    )
+  }
+}
+
+// Flutter -> AVFoundation
+let avMetadataObjectTypes: [String: AVMetadataObject.ObjectType] =
+  [
+    "aztec": .aztec,
+    "code128": .code128,
+    "code39": .code39,
+    "code39mod43": .code39Mod43,
+    "code93": .code93,
+    "dataMatrix": .dataMatrix,
+    "ean13": .ean13,
+    "ean8": .ean8,
+    "itf": .itf14,
+    "pdf417": .pdf417,
+    "qr": .qr,
+    "upcE": .upce,
+    "interleaved": .interleaved2of5,
+  ]
+
+// Flutter -> Vision
+let vnBarcodeSymbols: [String: VNBarcodeSymbology] =
+  [
+    "aztec": .aztec,
+    "code128": .code128,
+    "code39": .code39,  // Which one?
+    "code93": .code93,  // Which one?
+    "dataMatrix": .dataMatrix,
+    "ean13": .ean13,
+    "ean8": .ean8,
+    "itf": .itf14,
+    "pdf417": .pdf417,
+    "qr": .qr,
+    "upcE": .upce,
+    "interleaved": .i2of5,  // Which one?
+  ]
+
+// AVFoundation -> Flutter
+let flutterMetadataObjectTypes = Dictionary(
+  uniqueKeysWithValues: avMetadataObjectTypes.map { ($1, $0) })
+
+// Vision -> Flutter
+let flutterVNSymbols = Dictionary(uniqueKeysWithValues: vnBarcodeSymbols.map { ($1, $0) })
+
+let cameraPositions: [String: AVCaptureDevice.Position] =
+  [
+    "front": .front,
+    "back": .back,
+  ]
+
+enum Resolution: String {
+  case sd480, hd720, hd1080, hd4k
+
+  var size: (width: Int32, height: Int32) {
+    switch self {
+    case .sd480: return (720, 480)
+    case .hd720: return (1280, 720)
+    case .hd1080: return (1920, 1080)
+    case .hd4k: return (3840, 2160)
+    }
+  }
+}
+
+enum Framerate: String {
+  case fps30, fps60, fps120, fps240
+
+  var numberValue: Double {
+    switch self {
+    case .fps30: return 30
+    case .fps60: return 60
+    case .fps120: return 120
+    case .fps240: return 240
+    }
+  }
+}
+
+enum DetectionMode: String {
+  case pauseDetection, pauseVideo, continuous
+}
+
+enum ApiMode: String {
+  case avFoundation, vision
+}
diff --git a/fast_barcode_scanner/ios/Classes/types/PreviewConfiguration.swift b/fast_barcode_scanner/ios/Classes/types/PreviewConfiguration.swift
index 649a513a..3bf236b9 100644
--- a/fast_barcode_scanner/ios/Classes/types/PreviewConfiguration.swift
+++ b/fast_barcode_scanner/ios/Classes/types/PreviewConfiguration.swift
@@ -1,15 +1,13 @@
 struct PreviewConfiguration {
-    let width: Int32
-    let height: Int32
-    let targetRotation: Int
-    let textureId: Int64
+  let previewWidth: Int32
+  let previewHeight: Int32
+  let analysisWidth: Int32
+  let analysisHeight: Int32
 
-    var asDict: [String: Any] {
-        ["width": height,
-         "height": width,
-         "targetRotation": targetRotation,
-         "textureId": textureId,
-         "analysisWidth": width,
-         "analysisHeight": height]
-    }
+  var dict: [String: Any] {
+    [
+      "preview_size": [previewWidth, previewHeight],
+      "analysis_size": [analysisWidth, analysisHeight],
+    ]
+  }
 }
diff --git a/fast_barcode_scanner/ios/Classes/types/ScannerConfiguration.swift b/fast_barcode_scanner/ios/Classes/types/ScannerConfiguration.swift
deleted file mode 100644
index 473b247c..00000000
--- a/fast_barcode_scanner/ios/Classes/types/ScannerConfiguration.swift
+++ /dev/null
@@ -1,143 +0,0 @@
-import AVFoundation
-import Vision
-
-struct ScannerConfiguration {
-
-    init(position: AVCaptureDevice.Position,
-         framerate: Framerate,
-         resolution: Resolution,
-         mode: DetectionMode,
-         codes: [String]) {
-        self.position = position
-        self.framerate = framerate
-        self.resolution = resolution
-        self.detectionMode = mode
-        self.codes = codes
-    }
-
-    init?(_ args: Any?) {
-        guard
-            let dict = args as? [String: Any],
-            let position = cameraPositions[dict["pos"] as? String ?? ""],
-            let resolution = Resolution(rawValue: dict["res"] as? String ?? ""),
-            let framerate = Framerate(rawValue: dict["fps"] as? String ?? ""),
-            let detectionMode = DetectionMode(rawValue: dict["mode"] as? String ?? ""),
-            let codes = dict["types"] as? [String]
-            else {
-                return nil
-        }
-
-        self.init(position: position,
-                  framerate: framerate,
-                  resolution: resolution,
-                  mode: detectionMode,
-                  codes: codes
-        )
-    }
-
-    let position: AVCaptureDevice.Position
-    let framerate: Framerate
-    let resolution: Resolution
-    let detectionMode: DetectionMode
-    let codes: [String]
-
-    func copy(with args: Any?) -> ScannerConfiguration? {
-        guard let dict = args as? [String: Any] else { return nil }
-
-        return ScannerConfiguration.init(
-            position: cameraPositions[dict["pos"] as? String ?? ""] ?? position,
-            framerate: Framerate(rawValue: dict["fps"] as? String ?? "") ?? framerate,
-            resolution: Resolution(rawValue: dict["res"] as? String ?? "") ?? resolution,
-            mode: DetectionMode(rawValue: dict["mode"] as? String ?? "") ?? detectionMode,
-            codes: dict["types"] as? [String] ?? codes
-        )
-    }
-}
-
-// Flutter -> AVFoundation
-let avMetadataObjectTypes: [String: AVMetadataObject.ObjectType] =
-[
-    "aztec": .aztec,
-    "code128": .code128,
-    "code39": .code39,
-    "code39mod43": .code39Mod43,
-    "code93": .code93,
-    "dataMatrix": .dataMatrix,
-    "ean13": .ean13,
-    "ean8": .ean8,
-    "itf": .itf14,
-    "pdf417": .pdf417,
-    "qr": .qr,
-    "upcE": .upce,
-    "interleaved": .interleaved2of5
-]
-
-// Flutter -> Vision
-@available(iOS 11, *)
-let vnBarcodeSymbols: [String: VNBarcodeSymbology] =
-[
-    "aztec": .aztec,
-    "code128": .code128,
-    "code39": .code39, // Which one?
-    "code93": .code93, // Which one?
-    "dataMatrix": .dataMatrix,
-    "ean13": .ean13,
-    "ean8": .ean8,
-    "itf": .itf14,
-    "pdf417": .pdf417,
-    "qr": .qr,
-    "upcE": .upce,
-    "interleaved": .i2of5 // Which one?
-]
-
-// AVFoundation -> Flutter
-let flutterMetadataObjectTypes = Dictionary(uniqueKeysWithValues: avMetadataObjectTypes.map { ($1, $0) })
-
-// Vision -> Flutter
-@available(iOS 11, *)
-let flutterVNSymbols = Dictionary(uniqueKeysWithValues: vnBarcodeSymbols.map { ($1, $0) })
-
-let cameraPositions: [String: AVCaptureDevice.Position] =
-[
-    "front": .front,
-    "back": .back
-]
-
-enum Resolution: String {
-    case sd480, hd720, hd1080, hd4k
-
-    var width: Int32 {
-        switch self {
-        case .sd480: return 720
-        case .hd720: return 1280
-        case .hd1080: return 1920
-        case .hd4k: return 3840
-        }
-    }
-
-    var height: Int32 {
-        switch self {
-        case .sd480: return 480
-        case .hd720: return 720
-        case .hd1080: return 1080
-        case .hd4k: return 2160
-        }
-    }
-}
-
-enum Framerate: String {
-    case fps30, fps60, fps120, fps240
-
-    var doubleValue: Double {
-        switch self {
-        case .fps30: return 30
-        case .fps60: return 60
-        case .fps120: return 120
-        case .fps240: return 240
-        }
-    }
-}
-
-enum DetectionMode: String {
-    case pauseDetection, pauseVideo, continuous
-}
diff --git a/fast_barcode_scanner/ios/Classes/types/ScannerError.swift b/fast_barcode_scanner/ios/Classes/types/ScannerError.swift
index 401b1116..2035b233 100644
--- a/fast_barcode_scanner/ios/Classes/types/ScannerError.swift
+++ b/fast_barcode_scanner/ios/Classes/types/ScannerError.swift
@@ -1,99 +1,115 @@
 import Flutter
 
 extension Error {
-    var flutterError: FlutterError {
-        if let error = self as? ScannerError {
-            return error.flutterError
-        } else {
-            return FlutterError(code: "UNEXPECTED_ERROR",
-                                message: "Unknown error occured.",
-                                details: nil)
-        }
+  var flutterError: FlutterError {
+    if let error = self as? ScannerError {
+      return error.flutterError
+    } else {
+      return FlutterError(
+        code: "UNEXPECTED_ERROR",
+        message: "Unknown error occured.",
+        details: nil)
     }
+  }
 }
 
 enum ScannerError: Error {
-    case notInitialized
-    case alreadyInitialized
-    case notRunning
-    case alreadyRunning
-    case noInputDeviceForConfig(ScannerConfiguration)
-    case cameraNotSuitable(Resolution, Framerate)
-    case unauthorized
-    case configurationError(String)
-    case invalidArguments(Any?)
-    case invalidCodeType(String)
-    case loadingFailed
-    case analysisFailed(Error)
-    case minimumTarget
-    case loadingURLFailed(String)
-    case loadingDataFailed
+  case notInitialized
+  case alreadyInitialized
+  case notRunning
+  case alreadyRunning
+  case noInputDeviceForConfig(CameraConfiguration)
+  case cameraNotSuitable(Resolution, Framerate)
+  case unauthorized
+  case configurationError(String)
+  case invalidArguments(Any?)
+  case invalidCodeType(String)
+  case loadingFailed
+  case analysisFailed(Error)
+  case minimumTarget
+  case loadingURLFailed(String)
+  case loadingDataFailed
 
-    var flutterError: FlutterError {
-        switch self {
-        case .notInitialized:
-            return FlutterError(code: "NOT_INITIALIZED",
-                                message: "Camera has not been initialized",
-                                details: nil)
-        case .alreadyInitialized:
-            return FlutterError(code: "ALREADY_INITIALIZED",
-                                message: "Camera is already initialized",
-                                details: nil)
-        case .notRunning:
-            return FlutterError(code: "NOT_RUNNING",
-                                message: "Camera is not running",
-                                details: nil)
-        case .alreadyRunning:
-            return FlutterError(code: "ALREADY_RUNNING",
-                                message: "Camera is already running",
-                                details: nil)
-        case .cameraNotSuitable(let res, let fps):
-            return FlutterError(code: "CAMERA_NOT_SUITABLE",
-                                message: """
-                                    The camera does not support the requested resolution (\(res)) \
-                                    and framerate (\(fps)) combination
-                                    """,
-                                details: "Try to lower your settings")
-        case .configurationError(let error):
-            return FlutterError(code: "CONFIGURATION_FAILED",
-                                message: "Configuration failed (\(error))",
-                                details: nil)
-        case .noInputDeviceForConfig(let config):
-            return FlutterError(code: "NO_INPUT_DEVICE",
-                                message: "No input device found for configuration (\(config)",
-                                details: "Are you using a simulator?")
-        case .unauthorized:
-            return FlutterError(code: "UNAUTHORIZED",
-                                message: "The application is not authorized to use the camera device",
-                                details: nil)
-        case .invalidArguments(let args):
-            return FlutterError(code: "INVALID_ARGUMENT",
-                                message: "Invalid arguments provided (\(String(describing: args)))",
-                                details: nil)
-        case .invalidCodeType(let type):
-            return FlutterError(code: "INVALID_CODE",
-                                message: "Invalid code type \(type)",
-                                details: nil)
-        case .loadingFailed:
-            return FlutterError(code: "LOADING_FAILED",
-                                message: "Could not load asset",
-                                details: nil)
-        case .analysisFailed(let error):
-            return FlutterError(code: "ANALYSIS_FAILED",
-                                message: "Could not analyse asset",
-                                details: error.localizedDescription)
-        case .minimumTarget:
-            return FlutterError(code: "MINIMUM_TARGET",
-                                message: "iOS 11 or higher required",
-                                details: nil)
-        case .loadingURLFailed(let url):
-            return FlutterError(code: "LOADING_URL_FAILED",
-                                message: "Loading image from url failed",
-                                details: url)
-        case .loadingDataFailed:
-            return FlutterError(code: "LOADING_DATA_FAILED",
-                                message: "Loading image from data failed",
-                                details: nil)
-        }
+  var flutterError: FlutterError {
+    switch self {
+    case .notInitialized:
+      return FlutterError(
+        code: "NOT_INITIALIZED",
+        message: "Camera has not been initialized",
+        details: nil)
+    case .alreadyInitialized:
+      return FlutterError(
+        code: "ALREADY_INITIALIZED",
+        message: "Camera is already initialized",
+        details: nil)
+    case .notRunning:
+      return FlutterError(
+        code: "NOT_RUNNING",
+        message: "Camera is not running",
+        details: nil)
+    case .alreadyRunning:
+      return FlutterError(
+        code: "ALREADY_RUNNING",
+        message: "Camera is already running",
+        details: nil)
+    case .cameraNotSuitable(let res, let fps):
+      return FlutterError(
+        code: "CAMERA_NOT_SUITABLE",
+        message: """
+          The camera does not support the requested resolution (\(res)) \
+          and framerate (\(fps)) combination
+          """,
+        details: "Try to lower your settings")
+    case .configurationError(let error):
+      return FlutterError(
+        code: "CONFIGURATION_FAILED",
+        message: "Configuration failed (\(error))",
+        details: nil)
+    case .noInputDeviceForConfig(let config):
+      return FlutterError(
+        code: "NO_INPUT_DEVICE",
+        message: "No input device found for configuration (\(config)",
+        details: "Are you using a simulator?")
+    case .unauthorized:
+      return FlutterError(
+        code: "UNAUTHORIZED",
+        message: "The application is not authorized to use the camera device",
+        details: nil)
+    case .invalidArguments(let args):
+      return FlutterError(
+        code: "INVALID_ARGUMENT",
+        message: "Invalid arguments provided (\(String(describing: args)))",
+        details: nil)
+    case .invalidCodeType(let type):
+      return FlutterError(
+        code: "INVALID_CODE",
+        message: "Invalid code type \(type)",
+        details: nil)
+    case .loadingFailed:
+      return FlutterError(
+        code: "LOADING_FAILED",
+        message: "Could not load asset",
+        details: nil)
+    case .analysisFailed(let error):
+      return FlutterError(
+        code: "ANALYSIS_FAILED",
+        message: "Could not analyse asset",
+        details: error.localizedDescription)
+    case .minimumTarget:
+      return FlutterError(
+        code: "MINIMUM_TARGET",
+        message: "iOS 12 or higher required",
+        details: nil)
+    case .loadingURLFailed(let url):
+      return FlutterError(
+        code: "LOADING_URL_FAILED",
+        message: "Loading image from url failed",
+        details: url)
+    case .loadingDataFailed:
+      return FlutterError(
+        code: "LOADING_DATA_FAILED",
+        message: "Loading image from data failed",
+        details: nil)
     }
+  }
 }
diff --git a/fast_barcode_scanner/lib/fast_barcode_scanner.dart b/fast_barcode_scanner/lib/fast_barcode_scanner.dart
index ff4ff8e3..245eecf3 100644
--- a/fast_barcode_scanner/lib/fast_barcode_scanner.dart
+++ b/fast_barcode_scanner/lib/fast_barcode_scanner.dart
@@ -1,10 +1,9 @@
 export 'package:fast_barcode_scanner/src/barcode_camera.dart';
 export 'package:fast_barcode_scanner/src/camera_controller.dart';
-export 'package:fast_barcode_scanner/src/types/scanner_configuration.dart';
-export 'package:fast_barcode_scanner/src/types/scanner_event.dart';
 export 'package:fast_barcode_scanner/src/overlays/blur_overlay.dart';
 export 'package:fast_barcode_scanner/src/overlays/material_finder_overlay/material_finder_overlay.dart';
-export 'src/overlays/code_boundary_overlay/code_boundary_overlay.dart';
+export 'package:fast_barcode_scanner/src/types/scanner_configuration.dart';
+export 'package:fast_barcode_scanner/src/types/scanner_event.dart';
 export 'package:fast_barcode_scanner_platform_interface/fast_barcode_scanner_platform_interface.dart'
     show
         Barcode,
@@ -14,4 +13,9 @@ export 'package:fast_barcode_scanner_platform_interface/fast_barcode_scanner_pla
         Resolution,
         DetectionMode,
         CameraPosition,
-        PreviewConfiguration;
+        PreviewConfiguration,
+        AppleApiMode;
+
+export 'src/overlays/code_boundary_overlay/code_boundary_overlay.dart';
+export 'src/overlays/overlays.dart';
+export 'src/overlays/rect_of_interest.dart';
diff --git a/fast_barcode_scanner/lib/src/barcode_camera.dart b/fast_barcode_scanner/lib/src/barcode_camera.dart
index 7ad25fff..5f31bdbd 100644
--- a/fast_barcode_scanner/lib/src/barcode_camera.dart
+++ b/fast_barcode_scanner/lib/src/barcode_camera.dart
@@ -20,28 +20,28 @@ Widget _defaultOnError(BuildContext context, Object? error) {
 
 /// The main class connecting the platform code to the UI.
 ///
-/// This class is used in the widget tree and connects to the camera
-/// as soon as didChangeDependencies gets called.
+/// This class connects to the camera as soon as `didChangeDependencies` gets called.
 class BarcodeCamera extends StatefulWidget {
   const BarcodeCamera({
-    Key? key,
+    super.key,
     required this.types,
     this.mode = DetectionMode.pauseVideo,
     this.resolution = Resolution.hd720,
     this.framerate = Framerate.fps30,
     this.position = CameraPosition.back,
+    this.appleApiMode,
     this.onScan,
     this.children = const [],
     this.dispose = true,
     ErrorCallback? onError,
-  })  : onError = onError ?? _defaultOnError,
-        super(key: key);
+  }) : onError = onError ?? _defaultOnError;
 
   final List<BarcodeType> types;
   final Resolution resolution;
   final Framerate framerate;
   final DetectionMode mode;
   final CameraPosition position;
+  final ApiMode? appleApiMode;
   final OnDetectionHandler? onScan;
   final List<Widget> children;
   final ErrorCallback onError;
@@ -55,7 +55,7 @@ class BarcodeCameraState extends State<BarcodeCamera> {
   var _opacity = 0.0;
   var showingError = false;
 
-  final cameraController = CameraController();
+  final cameraController = CameraController.shared;
 
   @override
   void didChangeDependencies() {
@@ -67,9 +67,17 @@ class BarcodeCameraState extends State<BarcodeCamera> {
             resolution: widget.resolution,
             framerate: widget.framerate,
             position: widget.position,
-            onScan: widget.onScan)
-        : cameraController.initialize(widget.types, widget.resolution,
-            widget.framerate, widget.position, widget.mode, widget.onScan);
+            onScan: widget.onScan,
+          )
+        : cameraController.initialize(
+            types: widget.types,
+            resolution: widget.resolution,
+            framerate: widget.framerate,
+            position: widget.position,
+            detectionMode: widget.mode,
+            onScan: widget.onScan,
+            apiMode: widget.appleApiMode,
+          );
 
     configurationFuture
         .whenComplete(() => setState(() => _opacity = 1.0))
@@ -79,6 +87,8 @@ class BarcodeCameraState extends State<BarcodeCamera> {
   }
 
   void onScannerEvent() {
+    if (!mounted) return;
+
     if (cameraController.events.value != ScannerEvent.error && showingError) {
       setState(() => showingError = false);
     } else if (cameraController.events.value == ScannerEvent.error) {
@@ -95,35 +105,43 @@ class BarcodeCameraState extends State<BarcodeCamera> {
     }
 
     cameraController.events.removeListener(onScannerEvent);
+
     super.dispose();
   }
 
   @override
   Widget build(BuildContext context) {
     final cameraState = cameraController.state;
+
     return ColoredBox(
-      color: Colors.black,
+      color: Colors.white,
       child: AnimatedOpacity(
         opacity: _opacity,
         duration: const Duration(milliseconds: 260),
         child: cameraController.events.value == ScannerEvent.error
             ? widget.onError(
                 context,
-                cameraState.error ?? "Unknown error occured",
+                cameraState.error ?? "Unknown error occurred",
               )
             : Stack(
                 fit: StackFit.expand,
                 children: [
-                  if (cameraState.isInitialized)
-                    _buildPreview(cameraState.previewConfig!),
+                  if (cameraState.isInitialized) _CameraPreview(config: cameraState.previewConfig!),
                   ...widget.children
                 ],
               ),
       ),
     );
   }
+}
+
+class _CameraPreview extends StatelessWidget {
+  const _CameraPreview({required this.config});
 
-  Widget _buildPreview(PreviewConfiguration config) {
+  final PreviewConfiguration config;
+
+  @override
+  Widget build(BuildContext context) {
     return FittedBox(
       fit: BoxFit.cover,
       child: SizedBox(
diff --git a/fast_barcode_scanner/lib/src/camera_controller.dart b/fast_barcode_scanner/lib/src/camera_controller.dart
index 6f71d12c..e556beff 100644
--- a/fast_barcode_scanner/lib/src/camera_controller.dart
+++ b/fast_barcode_scanner/lib/src/camera_controller.dart
@@ -20,123 +20,37 @@ class ScannerState {
 
   bool get isInitialized => _previewConfig != null;
 
-  bool get hasError => _error != null;
-
   Object? get error => _error;
 }
 
-/// Middleman, handling the communication with native platforms.
+/// This class facilitates the communication with the platform interface.
+/// It is purely for convinience. You can always use the
+/// `FastBarcodeScannerPlatform` or `MethodChannelFastBarcodeScanner` yourself.
 ///
-/// Allows for custom backends.
-abstract class CameraController {
-  static final _instance = _CameraController._internal();
-
-  factory CameraController() => _instance;
-
-  /// The cumulated state of the barcode scanner.
-  ///
-  /// Contains information about the configuration, torch,
-  /// and errors
-  final state = ScannerState();
-
-  /// reports most recently scanned codes
-  ValueNotifier<List<Barcode>> get scannedBarcodes;
-
-  /// the size of the image used by the native analysis system to scan the code
-  /// scanned codes have coordinate information that is based on this image size
-  Size? get analysisSize;
-
-  /// A [ValueNotifier] for camera state events.
-  ///
-  ///
-  final ValueNotifier<ScannerEvent> events =
-      ValueNotifier(ScannerEvent.uninitialized);
-
-  /// Informs the platform to initialize the camera.
-  ///
-  /// Events and errors are received via the current state's eventNotifier.
-  Future<void> initialize(
-    List<BarcodeType> types,
-    Resolution resolution,
-    Framerate framerate,
-    CameraPosition position,
-    DetectionMode detectionMode,
-    OnDetectionHandler? onScan,
-  );
-
-  /// Stops the camera and disposes all associated resources.
-  ///
-  ///
-  Future<void> dispose();
-
-  /// Resumes the preview on the platform level.
-  ///
-  ///
-  Future<void> resumeCamera();
-
-  /// Pauses the preview on the platform level.
-  ///
-  ///
-  Future<void> pauseCamera();
-
-  /// Resumes the scanner on the platform level.
-  ///
-  ///
-  Future<void> resumeScanner();
+class CameraController {
+  CameraController._internal() : super();
 
-  /// Pauses the scanner on the platform level.
-  ///
-  ///
-  Future<void> pauseScanner();
+  static final shared = CameraController._internal();
 
-  /// Toggles the torch, if available.
-  ///
-  ///
-  Future<bool> toggleTorch();
-
-  /// Reconfigure the scanner.
-  ///
-  /// Can be called while running.
-  Future<void> configure({
-    List<BarcodeType>? types,
-    Resolution? resolution,
-    Framerate? framerate,
-    DetectionMode? detectionMode,
-    CameraPosition? position,
-    OnDetectionHandler? onScan,
-  });
-
-  /// Analyze a still image, which can be chosen from an image picker.
-  ///
-  /// It is recommended to pause the live scanner before calling this.
-  Future<List<Barcode>?> scanImage(ImageSource source);
-}
-
-class _CameraController implements CameraController {
-  _CameraController._internal() : super();
+  // factory CameraController() => shared;
 
   StreamSubscription? _scanSilencerSubscription;
 
-  final FastBarcodeScannerPlatform _platform =
-      FastBarcodeScannerPlatform.instance;
+  final FastBarcodeScannerPlatform _platform = FastBarcodeScannerPlatform.instance;
 
-  @override
   final state = ScannerState();
 
-  @override
   final events = ValueNotifier(ScannerEvent.uninitialized);
 
   static const scannedCodeTimeout = Duration(milliseconds: 250);
   DateTime? _lastScanTime;
-  @override
+
   ValueNotifier<List<Barcode>> scannedBarcodes = ValueNotifier([]);
 
-  @override
   Size? get analysisSize {
     final previewConfig = state.previewConfig;
     if (previewConfig != null) {
-      return Size(previewConfig.analysisWidth.toDouble(),
-          previewConfig.analysisHeight.toDouble());
+      return Size(previewConfig.analysisWidth.toDouble(), previewConfig.analysisHeight.toDouble());
     }
     return null;
   }
@@ -154,24 +68,36 @@ class _CameraController implements CameraController {
   /// User-defined handler, called when a barcode is detected
   OnDetectionHandler? _onScan;
 
-  @override
-  Future<void> initialize(
-    List<BarcodeType> types,
-    Resolution resolution,
-    Framerate framerate,
-    CameraPosition position,
-    DetectionMode detectionMode,
+  /// Curried function for [_onScan]. This ensures that each scan receipt is done
+  /// consistently. We log [_lastScanTime] and update the [scannedBarcodes] ValueNotifier
+  OnDetectionHandler _buildScanHandler(OnDetectionHandler? onScan) {
+    return (barcodes) {
+      _lastScanTime = DateTime.now();
+      scannedBarcodes.value = barcodes;
+      onScan?.call(barcodes);
+    };
+  }
+
+  Future<void> initialize({
+    required List<BarcodeType> types,
+    required Resolution resolution,
+    required Framerate framerate,
+    required CameraPosition position,
+    required DetectionMode detectionMode,
+    ApiMode? apiMode,
     OnDetectionHandler? onScan,
-  ) async {
+  }) async {
     try {
       state._previewConfig = await _platform.init(
-          types, resolution, framerate, detectionMode, position);
-
-      _onScan = (barcodes) {
-        _lastScanTime = DateTime.now();
-        scannedBarcodes.value = barcodes;
-        onScan?.call(barcodes);
-      };
+        types,
+        resolution,
+        framerate,
+        detectionMode,
+        position,
+        apiMode: apiMode,
+      );
+
+      _onScan = _buildScanHandler(onScan);
       _scanSilencerSubscription = Stream.periodic(scannedCodeTimeout).listen((event) {
         final scanTime = _lastScanTime;
         if (scanTime != null && DateTime.now().difference(scanTime) > scannedCodeTimeout) {
@@ -182,8 +108,8 @@ class _CameraController implements CameraController {
 
       _platform.setOnDetectHandler(_onDetectHandler);
 
-      state._scannerConfig = ScannerConfiguration(
-          types, resolution, framerate, position, detectionMode);
+      state._scannerConfig =
+          ScannerConfiguration(types, resolution, framerate, position, detectionMode);
 
       state._error = null;
 
@@ -195,13 +121,9 @@ class _CameraController implements CameraController {
     }
   }
 
-  @override
   Future<void> dispose() async {
     try {
-      if (state.isInitialized) {
-        await _platform.dispose();
-      }
-
+      await _platform.dispose();
       state._scannerConfig = null;
       state._previewConfig = null;
       state._torch = false;
@@ -215,7 +137,6 @@ class _CameraController implements CameraController {
     }
   }
 
-  @override
   Future<void> pauseCamera() async {
     try {
       await _platform.stop();
@@ -227,7 +148,6 @@ class _CameraController implements CameraController {
     }
   }
 
-  @override
   Future<void> resumeCamera() async {
     try {
       await _platform.start();
@@ -239,7 +159,6 @@ class _CameraController implements CameraController {
     }
   }
 
-  @override
   Future<void> pauseScanner() async {
     try {
       await _platform.stopDetector();
@@ -250,7 +169,6 @@ class _CameraController implements CameraController {
     }
   }
 
-  @override
   Future<void> resumeScanner() async {
     try {
       await _platform.startDetector();
@@ -261,7 +179,6 @@ class _CameraController implements CameraController {
     }
   }
 
-  @override
   Future<bool> toggleTorch() async {
     if (!_togglingTorch) {
       _togglingTorch = true;
@@ -280,7 +197,6 @@ class _CameraController implements CameraController {
     return state._torch;
   }
 
-  @override
   Future<void> configure({
     List<BarcodeType>? types,
     Resolution? resolution,
@@ -290,7 +206,7 @@ class _CameraController implements CameraController {
     OnDetectionHandler? onScan,
   }) async {
     if (state.isInitialized && !_configuring) {
-      final _scannerConfig = state._scannerConfig!;
+      final scannerConfig = state._scannerConfig!;
       _configuring = true;
 
       try {
@@ -302,7 +218,7 @@ class _CameraController implements CameraController {
           position: position,
         );
 
-        state._scannerConfig = _scannerConfig.copyWith(
+        state._scannerConfig = scannerConfig.copyWith(
           types: types,
           resolution: resolution,
           framerate: framerate,
@@ -310,9 +226,7 @@ class _CameraController implements CameraController {
           position: position,
         );
 
-        if (onScan != null) {
-          _onScan = onScan;
-        }
+        _onScan = _buildScanHandler(onScan);
       } catch (error) {
         state._error = error;
         events.value = ScannerEvent.error;
@@ -323,7 +237,6 @@ class _CameraController implements CameraController {
     }
   }
 
-  @override
   Future<List<Barcode>?> scanImage(ImageSource source) async {
     try {
       return _platform.scanImage(source);
@@ -342,20 +255,18 @@ class _CameraController implements CameraController {
 
 class ScannedBarcodes {
   final List<Barcode> barcodes;
-  final DateTime scannedAt;
+  final DateTime timestamp;
 
-  ScannedBarcodes(this.barcodes) : scannedAt = DateTime.now();
+  ScannedBarcodes(this.barcodes) : timestamp = DateTime.now();
 
   ScannedBarcodes.none() : this([]);
 
-  @override
   bool operator ==(Object other) =>
       identical(this, other) ||
       other is ScannedBarcodes &&
           runtimeType == other.runtimeType &&
           barcodes == other.barcodes &&
-          scannedAt == other.scannedAt;
+          timestamp == other.timestamp;
 
-  @override
-  int get hashCode => barcodes.hashCode ^ scannedAt.hashCode;
+  int get hashCode => barcodes.hashCode ^ timestamp.hashCode;
 }
diff --git a/fast_barcode_scanner/lib/src/corner_point_utils.dart b/fast_barcode_scanner/lib/src/corner_point_utils.dart
new file mode 100644
index 00000000..1548cfb3
--- /dev/null
+++ b/fast_barcode_scanner/lib/src/corner_point_utils.dart
@@ -0,0 +1,63 @@
+import 'dart:math';
+import 'dart:ui';
+
+/// We use BoxFit.cover to display our preview
+///
+/// Because of this, the source image is scaled to fill the longest edge of our widget
+/// while the other portion of our image is clipped/cropped
+///
+/// In order to scale the points without distortion, we must obtain the scale factor
+/// from the longest side of our box: either x or y (not both).
+///
+/// Using this single-dimension scale factor we can calculate how much of the image is cropped.
+/// we then apply this adjustment on the cropped dimension
+Offset scaleCodeCornerPoint({
+  required Offset cornerPoint,
+  required Size analysisImageSize,
+  required Size widgetSize,
+}) {
+  // The analysis image is usually landscape regardless of the preview orientation
+  final isAnalysisImageLandscape =
+      analysisImageSize.width > analysisImageSize.height;
+  final analysisHeight = isAnalysisImageLandscape
+      ? analysisImageSize.width
+      : analysisImageSize.height; // 640
+  final analysisWidth = isAnalysisImageLandscape
+      ? analysisImageSize.height
+      : analysisImageSize.width; // 480
+
+  // our widget may have any dimension for the preview. The preview image will be scaled towards the longest edge
+  double scale = 1;
+  double cropAdjustmentX = 0;
+  double cropAdjustmentY = 0;
+  if (widgetSize.width > widgetSize.height) {
+    // the source image will be scaled to fit the width because it is the longest side
+    // Y will need to be adjusted for the crop amount
+    scale = widgetSize.width / analysisHeight;
+    // essentially, we will scale the analysis image height at the same factor
+    // as the width. The height of the analysis image will be larger than the
+    // height of the widget. BoxFit.cover will cause the top and bottom of the
+    // preview image to be cropped out equally (which is why we divide by 2)
+    cropAdjustmentY = ((scale * analysisHeight) - widgetSize.height) / 2;
+  } else {
+    // the source image will be scaled to fit the height because it is the longest side
+    // the X will need to be adjusted for the crop amount
+    scale = widgetSize.height / analysisHeight;
+    // find out how much horizontal adjustment is necessary to account for the cropping.
+    cropAdjustmentX = ((scale * analysisWidth) - widgetSize.width) / 2;
+  }
+  return Offset((cornerPoint.dx.toDouble() * scale) - cropAdjustmentX,
+      (cornerPoint.dy.toDouble() * scale) - cropAdjustmentY);
+}
+
+extension PointExtension on Point {
+  Offset toOffset() {
+    return Offset(x.toDouble(), y.toDouble());
+  }
+}
+
+extension SizeExtensions on Size {
+  Rect toRect() {
+    return Rect.fromLTWH(0, 0, width, height);
+  }
+}
diff --git a/fast_barcode_scanner/lib/src/overlays/blur_overlay.dart b/fast_barcode_scanner/lib/src/overlays/blur_overlay.dart
index f6553ef8..6f20d8ca 100644
--- a/fast_barcode_scanner/lib/src/overlays/blur_overlay.dart
+++ b/fast_barcode_scanner/lib/src/overlays/blur_overlay.dart
@@ -1,38 +1,36 @@
 import 'dart:ui';
 
+import 'package:flutter/material.dart';
+
 import '../camera_controller.dart';
 import '../types/scanner_event.dart';
-import 'package:flutter/material.dart';
 
-/// Blurs the preview when a barcode is detected
-///
-/// NOTICE: Does not work on iOS currently
-/// https://github.com/flutter/flutter/issues/43902
 class BlurPreviewOverlay extends StatelessWidget {
   final double blurAmount;
   final Duration duration;
 
   const BlurPreviewOverlay({
-    Key? key,
+    super.key,
     this.blurAmount = 30,
     this.duration = const Duration(milliseconds: 500),
-  }) : super(key: key);
+  });
 
   bool shouldBlur(event) => event == ScannerEvent.detected;
 
   @override
   Widget build(BuildContext context) {
     return ValueListenableBuilder(
-      valueListenable: CameraController().events,
+      valueListenable: CameraController.shared.events,
       builder: (context, event, child) {
-        return TweenAnimationBuilder<double>(
+        return TweenAnimationBuilder(
           tween: Tween(begin: 0.0, end: shouldBlur(event) ? blurAmount : 0.0),
           duration: duration,
           curve: Curves.easeOut,
           child: Container(color: Colors.black.withOpacity(0.0)),
           builder: (_, value, child) => BackdropFilter(
-              filter: ImageFilter.blur(sigmaX: value, sigmaY: value),
-              child: child),
+            filter: ImageFilter.blur(sigmaX: value, sigmaY: value),
+            child: child,
+          ),
         );
       },
     );
diff --git a/fast_barcode_scanner/lib/src/overlays/code_boundary_overlay/code_border_painter.dart b/fast_barcode_scanner/lib/src/overlays/code_boundary_overlay/code_border_painter.dart
index a422c09a..06478e46 100644
--- a/fast_barcode_scanner/lib/src/overlays/code_boundary_overlay/code_border_painter.dart
+++ b/fast_barcode_scanner/lib/src/overlays/code_boundary_overlay/code_border_painter.dart
@@ -1,16 +1,17 @@
 import 'package:flutter/material.dart';
 
 import '../../../fast_barcode_scanner.dart';
+import '../../corner_point_utils.dart';
 
 class CodeBorderPainter extends CustomPainter {
   final CodeBorderPaintBuilder? barcodePaintSelector;
-  final CodeValueDisplayBuilder? textDecorator;
+  final TextStyle Function(Barcode)? barcodeValueStyle;
 
   CodeBorderPainter({
     required this.imageSize,
     required this.barcodes,
     this.barcodePaintSelector,
-    this.textDecorator,
+    this.barcodeValueStyle,
   });
 
   final Size imageSize;
@@ -21,135 +22,73 @@ class CodeBorderPainter extends CustomPainter {
     ..strokeWidth = 2.0
     ..color = Colors.red;
 
-  Paint _getBarcodePaint(Barcode barcode) {
-    if (barcodePaintSelector != null) {
-      return barcodePaintSelector!(barcode);
-    }
-    return _standardPaint;
-  }
+  void paintBarcode(Canvas canvas, Size size, Barcode barcode) {
+    final path = Path();
 
-  CodeValueDisplay? _getTextDecoration(Barcode barcode) {
-    if (textDecorator != null) {
-      return textDecorator!(barcode);
-    }
-    return null;
-  }
+    if (barcode.boundingBox != null) {
+      final corners = [barcode.boundingBox!.topLeft, barcode.boundingBox!.bottomRight];
 
-  @override
-  void paint(Canvas canvas, Size size) {
-    for (Barcode barcode in barcodes) {
-      final Path path = Path();
-      final corners = barcode.cornerPoints;
-      if (corners != null) {
-        final offsets = corners
-            .map((e) => _scalePoint(
-                offset: Offset(e.x.toDouble(), e.y.toDouble()),
+      final offsets = corners
+          .map((e) => scaleCodeCornerPoint(
+                cornerPoint: Offset(e.x.toDouble(), e.y.toDouble()),
                 analysisImageSize: imageSize,
-                widgetSize: size))
-            .toList();
-        path.moveTo(offsets[0].dx, offsets[0].dy);
-        double minX = -1, maxX = -1, minY = -1, maxY = -1;
-        for (var offset in offsets) {
-          if (minX == -1 || offset.dx < minX) {
-            minX = offset.dx;
-          }
-          if (maxX == -1 || offset.dx > maxX) {
-            maxX = offset.dx;
-          }
-          if (minY == -1 || offset.dy < minY) {
-            minY = offset.dy;
-          }
-          if (maxY == -1 || offset.dy > maxY) {
-            maxY = offset.dy;
-          }
-          path.lineTo(offset.dx, offset.dy);
+                widgetSize: size,
+              ))
+          .toList();
+
+      path.moveTo(offsets[0].dx, offsets[0].dy);
+
+      double minX = -1, maxX = -1, minY = -1, maxY = -1;
+
+      for (var offset in offsets) {
+        if (minX == -1 || offset.dx < minX) {
+          minX = offset.dx;
+        }
+        if (maxX == -1 || offset.dx > maxX) {
+          maxX = offset.dx;
         }
-        // print("minX: $minX, maxX: $maxX, minY: $minY, maxY: $maxY");
-        path.close();
-        final barcodePaint = _getBarcodePaint(barcode);
-        canvas.drawPath(path, barcodePaint);
-
-        final textDecoration = _getTextDecoration(barcode);
-        if (textDecoration != null) {
-          final TextPainter tp = TextPainter(
-              text: textDecoration.textSpan,
-              textAlign: TextAlign.left,
-              textDirection: TextDirection.ltr);
-          tp.layout();
-
-          final pointsSortedByX = List.from(offsets);
-          pointsSortedByX.sort((a, b) => (b.dx - a.dx).toInt());
-          final pointsSortedByY = List.from(offsets);
-          pointsSortedByY.sort((a, b) => (b.dy - a.dy).toInt());
-
-          final centerX = minX + ((maxX - minX) / 2);
-          final textPositionX = centerX - (tp.width / 2);
-
-          const textPadding = 5;
-          double textPositionY;
-          if (textDecoration.location == CodeValueDisplayLocation.centerTop) {
-            textPositionY = minY - (tp.height + textPadding);
-          } else {
-            textPositionY = maxY + textPadding;
-          }
-          tp.paint(canvas, Offset(textPositionX, textPositionY));
+        if (minY == -1 || offset.dy < minY) {
+          minY = offset.dy;
         }
+        if (maxY == -1 || offset.dy > maxY) {
+          maxY = offset.dy;
+        }
+        path.lineTo(offset.dx, offset.dy);
       }
+
+      path.close();
+
+      final barcodePaint = barcodePaintSelector?.call(barcode) ?? _standardPaint;
+
+      canvas.drawPath(path, barcodePaint);
+
+      if (barcodeValueStyle == null) return;
+
+      final TextPainter tp = TextPainter(
+        text: TextSpan(text: barcode.value, style: barcodeValueStyle!(barcode)),
+        textAlign: TextAlign.left,
+        textDirection: TextDirection.ltr,
+      );
+
+      tp.layout();
+
+      final centerX = minX + ((maxX - minX) / 2);
+      final textPositionX = centerX - (tp.width / 2);
+      final textPositionY = maxY + 5;
+
+      tp.paint(canvas, Offset(textPositionX, textPositionY));
     }
   }
 
   @override
-  bool shouldRepaint(CodeBorderPainter oldDelegate) {
-    return oldDelegate.imageSize != imageSize ||
-        oldDelegate.barcodes != barcodes;
+  void paint(Canvas canvas, Size size) {
+    for (Barcode barcode in barcodes) {
+      paintBarcode(canvas, size, barcode);
+    }
   }
-}
 
-/// We use BoxFit.cover to display our preview
-///
-/// Because of this, the source image is scaled to fill the longest edge of our widget
-/// while the other portion of our image is clipped/cropped
-///
-/// In order to scale the points without distortion, we must obtain the scale factor
-/// from the longest side of our box: either x or y (not both).
-///
-/// Using this single-dimension scale factor we can calculate how much of the image is cropped.
-/// we then apply this adjustment on the cropped dimension
-Offset _scalePoint({
-  required Offset offset,
-  required Size analysisImageSize,
-  required Size widgetSize,
-}) {
-  // The analysis image is usually landscape regardless of the preview orientation
-  final isAnalysisImageLandscape =
-      analysisImageSize.width > analysisImageSize.height;
-  final analysisHeight = isAnalysisImageLandscape
-      ? analysisImageSize.width
-      : analysisImageSize.height; // 640
-  final analysisWidth = isAnalysisImageLandscape
-      ? analysisImageSize.height
-      : analysisImageSize.width; // 480
-
-  // our widget may have any dimension for the preview. The preview image will be scaled towards the longest edge
-  double scale = 1;
-  double cropAdjustmentX = 0;
-  double cropAdjustmentY = 0;
-  if (widgetSize.width > widgetSize.height) {
-    // the source image will be scaled to fit the width because it is the longest side
-    // Y will need to be adjusted for the crop amount
-    scale = widgetSize.width / analysisHeight;
-    // essentially, we will scale the analysis image height at the same factor
-    // as the width. The height of the analysis image will be larger than the
-    // height of the widget. BoxFit.cover will cause the top and bottom of the
-    // preview image to be cropped out equally (which is why we divide by 2)
-    cropAdjustmentY = ((scale * analysisHeight) - widgetSize.height) / 2;
-  } else {
-    // the source image will be scaled to fit the height because it is the longest side
-    // the X will need to be adjusted for the crop amount
-    scale = widgetSize.height / analysisHeight;
-    // find out how much horizontal adjustment is necessary to account for the cropping.
-    cropAdjustmentX = ((scale * analysisWidth) - widgetSize.width) / 2;
+  @override
+  bool shouldRepaint(CodeBorderPainter oldDelegate) {
+    return oldDelegate.imageSize != imageSize || oldDelegate.barcodes != barcodes;
   }
-  return Offset((offset.dx.toDouble() * scale) - cropAdjustmentX,
-      (offset.dy.toDouble() * scale) - cropAdjustmentY);
 }
diff --git a/fast_barcode_scanner/lib/src/overlays/code_boundary_overlay/code_boundary_overlay.dart b/fast_barcode_scanner/lib/src/overlays/code_boundary_overlay/code_boundary_overlay.dart
index 1f81a4b2..5abcf258 100644
--- a/fast_barcode_scanner/lib/src/overlays/code_boundary_overlay/code_boundary_overlay.dart
+++ b/fast_barcode_scanner/lib/src/overlays/code_boundary_overlay/code_boundary_overlay.dart
@@ -2,88 +2,45 @@ import 'package:fast_barcode_scanner/fast_barcode_scanner.dart';
 import 'package:fast_barcode_scanner/src/overlays/code_boundary_overlay/code_border_painter.dart';
 import 'package:flutter/material.dart';
 
-typedef CodeBorderPaintBuilder = Paint Function(Barcode code);
-typedef CodeValueDisplayBuilder = CodeValueDisplay? Function(Barcode code);
+typedef CodeBorderPaintBuilder = Paint Function(Barcode);
 
 class CodeBoundaryOverlay extends StatefulWidget {
-  final CodeBorderPaintBuilder? codeBorderPaintBuilder;
-  final CodeValueDisplayBuilder? codeValueDisplayBuilder;
+  final Paint Function(Barcode)? codeBorderPaintBuilder;
+  final TextStyle Function(Barcode)? barcodeValueStyle;
 
   const CodeBoundaryOverlay({
-    Key? key,
+    super.key,
     this.codeBorderPaintBuilder,
-    this.codeValueDisplayBuilder,
-  }) : super(key: key);
+    this.barcodeValueStyle,
+  });
 
   @override
   State<CodeBoundaryOverlay> createState() => _CodeBoundaryOverlayState();
 }
 
 class _CodeBoundaryOverlayState extends State<CodeBoundaryOverlay> {
-  final _cameraController = CameraController();
+  final _cameraController = CameraController.shared;
 
   @override
   Widget build(BuildContext context) {
     return ValueListenableBuilder<List<Barcode>>(
-        valueListenable: _cameraController.scannedBarcodes,
-        builder: (context, barcodes, child) {
-          final analysisSize = _cameraController.analysisSize;
-          if (analysisSize != null && barcodes.isNotEmpty) {
-            return CustomPaint(
-              painter: CodeBorderPainter(
-                imageSize: analysisSize,
-                barcodes: barcodes,
-                barcodePaintSelector: widget.codeBorderPaintBuilder,
-                textDecorator: widget.codeValueDisplayBuilder,
-              ),
-            );
-          } else {
-            return Container();
-          }
-        });
+      valueListenable: _cameraController.scannedBarcodes,
+      builder: (context, barcodes, child) {
+        final analysisSize = _cameraController.analysisSize;
+
+        if (analysisSize == null || barcodes.isEmpty) {
+          return ColoredBox(color: Colors.black);
+        }
+
+        return CustomPaint(
+          painter: CodeBorderPainter(
+            imageSize: analysisSize,
+            barcodes: barcodes,
+            barcodePaintSelector: widget.codeBorderPaintBuilder,
+            barcodeValueStyle: widget.barcodeValueStyle,
+          ),
+        );
+      },
+    );
   }
 }
-
-enum CodeValueDisplayLocation { centerTop, centerBottom }
-
-abstract class CodeValueDisplay {
-  final CodeValueDisplayLocation location;
-  final Color color;
-
-  TextSpan get textSpan;
-
-  CodeValueDisplay({
-    required this.color,
-    this.location = CodeValueDisplayLocation.centerBottom,
-  });
-}
-
-class BasicBarcodeValueDisplay extends CodeValueDisplay {
-  final String text;
-  final double fontSize;
-  final Color backgroundColor;
-  final FontWeight fontWeight;
-  final String fontFamily;
-
-  BasicBarcodeValueDisplay({
-    required this.text,
-    required Color color,
-    CodeValueDisplayLocation location = CodeValueDisplayLocation.centerBottom,
-    CodeBorderPaintBuilder? customBarcodePaintSelector,
-    this.fontSize = 16.0,
-    this.backgroundColor = Colors.white,
-    this.fontWeight = FontWeight.w600,
-    this.fontFamily = "Roboto",
-  }) : super(location: location, color: color);
-
-  @override
-  TextSpan get textSpan => TextSpan(
-        style: TextStyle(
-            color: color,
-            fontSize: fontSize,
-            backgroundColor: backgroundColor,
-            fontWeight: fontWeight,
-            fontFamily: fontFamily),
-        text: text,
-      );
-}
diff --git a/fast_barcode_scanner/lib/src/overlays/material_finder_overlay/material_finder_overlay.dart b/fast_barcode_scanner/lib/src/overlays/material_finder_overlay/material_finder_overlay.dart
index 5dd17746..51c4d5a3 100644
--- a/fast_barcode_scanner/lib/src/overlays/material_finder_overlay/material_finder_overlay.dart
+++ b/fast_barcode_scanner/lib/src/overlays/material_finder_overlay/material_finder_overlay.dart
@@ -1,11 +1,8 @@
-import '../../camera_controller.dart';
-import '../../types/scanner_event.dart';
+import 'package:fast_barcode_scanner/fast_barcode_scanner.dart';
+import 'package:fast_barcode_scanner_platform_interface/fast_barcode_scanner_platform_interface.dart';
 import 'package:flutter/material.dart';
-
 import 'material_finder_painter.dart';
 
-enum CutOutShape { square, wide }
-
 /// Mimics the official Material Design Barcode Scanner
 /// (https://material.io/design/machine-learning/barcode-scanning.html)
 ///
@@ -18,91 +15,195 @@ class MaterialPreviewOverlay extends StatefulWidget {
   /// * `aspectRatio` of the finder border.
   ///
   const MaterialPreviewOverlay({
-    Key? key,
+    super.key,
+    required this.rectOfInterest,
     this.showSensing = false,
     this.sensingColor = Colors.white,
     this.backgroundColor = Colors.black38,
-    this.cutOutShape = CutOutShape.wide,
     this.cutOutBorderColor = Colors.black87,
-  }) : super(key: key);
+    this.onScan,
+    this.onScannedBoundsColor,
+  });
 
   final bool showSensing;
-  final Color backgroundColor;
+  final Color? backgroundColor;
   final Color sensingColor;
-  final CutOutShape cutOutShape;
   final Color cutOutBorderColor;
+  final Color? Function(List<Barcode> scannedCodes)? onScannedBoundsColor;
+  final RectOfInterest rectOfInterest;
+  final OnDetectionHandler? onScan;
+
+  @override
+  State createState() {
+    if (!showSensing)
+      return StaticMaterialPreviewOverlayState();
+    else
+      return MaterialPreviewOverlayState();
+  }
+}
+
+class StaticMaterialPreviewOverlayState extends State<MaterialPreviewOverlay> {
+  List<Barcode> _filteredBarcodes = [];
 
   @override
-  MaterialPreviewOverlayState createState() => MaterialPreviewOverlayState();
+  void initState() {
+    super.initState();
+    CameraController.shared.scannedBarcodes.addListener(_onBarcodesDetected);
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+    CameraController.shared.scannedBarcodes.removeListener(_onBarcodesDetected);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final borderColor =
+        widget.onScannedBoundsColor?.call(_filteredBarcodes) ?? widget.cutOutBorderColor;
+
+    final defaultBorderPaint = Paint()
+      ..style = PaintingStyle.stroke
+      ..strokeWidth = 5
+      ..color = borderColor;
+
+    return RepaintBoundary(
+      child: SizedBox.expand(
+        child: Stack(
+          fit: StackFit.expand,
+          children: [
+            CustomPaint(
+              painter: MaterialFinderPainter(
+                borderPaint: defaultBorderPaint,
+                backgroundColor: widget.backgroundColor,
+                rectOfInterest: widget.rectOfInterest,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  void _onBarcodesDetected() {
+    final analysisSize = CameraController.shared.analysisSize;
+    final previewSize = context.size;
+
+    setState(() {
+      if (analysisSize != null && previewSize != null) {
+        _filteredBarcodes = CameraController.shared.scannedBarcodes.value
+            .where(widget.rectOfInterest.buildCodeFilter(
+              analysisSize: analysisSize,
+              previewSize: previewSize,
+            ))
+            .toList();
+      } else {
+        _filteredBarcodes = [];
+      }
+    });
+  }
 }
 
 class MaterialPreviewOverlayState extends State<MaterialPreviewOverlay>
     with SingleTickerProviderStateMixin {
+  List<Barcode> _filteredCodes = [];
+
   late AnimationController _controller;
-  late Animation<double> _opacitySequence;
-  late Animation<double> _inflateSequence;
+  late Animation<double> _opacityAnimation;
+  late Animation<double> _inflateAnimation;
 
   @override
   void initState() {
     super.initState();
-    if (widget.showSensing) {
-      _controller = AnimationController(
-          duration: const Duration(milliseconds: 1100), vsync: this);
-
-      const fadeIn = 20.0;
-      const wait = 2.0;
-      const expand = 25.0;
-
-      final cameraController = CameraController();
-
-      _opacitySequence = TweenSequence([
-        TweenSequenceItem(tween: Tween(begin: 0.0, end: 1.0), weight: fadeIn),
-        TweenSequenceItem(tween: ConstantTween(1.0), weight: wait),
-        TweenSequenceItem(
-            tween: Tween(begin: 1.0, end: 0.0)
-                .chain(CurveTween(curve: Curves.easeOutCubic)),
-            weight: expand),
-        // TweenSequenceItem(tween: ConstantTween(0.0), weight: wait),
-      ]).animate(_controller);
-
-      _inflateSequence = TweenSequence([
-        TweenSequenceItem(tween: ConstantTween(0.0), weight: fadeIn + wait),
-        TweenSequenceItem(
-            tween: Tween(begin: 0.0, end: 1.0)
-                .chain(CurveTween(curve: Curves.easeOutCubic)),
-            weight: expand),
-        // TweenSequenceItem(tween: ConstantTween(0.0), weight: wait),
-      ]).animate(_controller);
-
-      _controller.addStatusListener((status) {
-        if (status == AnimationStatus.completed &&
-            cameraController.events.value == ScannerEvent.resumed) {
-          Future.delayed(const Duration(seconds: 1, milliseconds: 500), () {
-            _controller.forward(from: _controller.lowerBound);
-          });
-        }
-      });
-
-      cameraController.events.addListener(() {
-        if (cameraController.events.value == ScannerEvent.resumed) {
-          _controller.forward();
-        } else {
-          _controller.reset();
-        }
-      });
+
+    const fadeIn = 20.0;
+    const wait = 2.0;
+    const expand = 25.0;
+
+    _controller = AnimationController(
+      duration: const Duration(milliseconds: 1100),
+      vsync: this,
+    );
+
+    final opacitySequence = TweenSequence([
+      TweenSequenceItem(tween: Tween(begin: 0.0, end: 1.0), weight: fadeIn),
+      TweenSequenceItem(tween: ConstantTween(1.0), weight: wait),
+      TweenSequenceItem(
+          tween: Tween(begin: 1.0, end: 0.0).chain(CurveTween(curve: Curves.easeOutCubic)),
+          weight: expand),
+      // TweenSequenceItem(tween: ConstantTween(0.0), weight: wait),
+    ]);
+
+    final inflateSequence = TweenSequence([
+      TweenSequenceItem(tween: ConstantTween(0.0), weight: fadeIn + wait),
+      TweenSequenceItem(
+          tween: Tween(begin: 0.0, end: 1.0).chain(CurveTween(curve: Curves.easeOutCubic)),
+          weight: expand),
+      // TweenSequenceItem(tween: ConstantTween(0.0), weight: wait),
+    ]);
+
+    _opacityAnimation = opacitySequence.animate(_controller);
+    _inflateAnimation = inflateSequence.animate(_controller);
+
+    _controller.addStatusListener((status) {
+      if (status == AnimationStatus.completed && _filteredCodes.isEmpty) {
+        Future.delayed(const Duration(milliseconds: 500), () {
+          if (!mounted) return;
+          _controller.forward(from: _controller.lowerBound);
+        });
+      }
+    });
+
+    _controller.forward();
+
+    CameraController.shared.scannedBarcodes.addListener(_onCodesScanned);
+  }
+
+  @override
+  void dispose() {
+    CameraController.shared.scannedBarcodes.removeListener(_onCodesScanned);
+    _controller.dispose();
+    super.dispose();
+  }
+
+  void _onCodesScanned() {
+    final analysisSize = CameraController.shared.analysisSize;
+    final previewSize = context.size;
+
+    setState(() {
+      if (analysisSize != null && previewSize != null) {
+        _filteredCodes = CameraController.shared.scannedBarcodes.value
+            .where(widget.rectOfInterest.buildCodeFilter(
+              analysisSize: analysisSize,
+              previewSize: previewSize,
+            ))
+            .toList();
+      } else {
+        _filteredCodes = [];
+      }
+    });
+
+    if (_filteredCodes.isEmpty) {
+      _controller.forward();
+    } else {
+      widget.onScan?.call(_filteredCodes);
+      _controller.reset();
     }
   }
 
   @override
   Widget build(BuildContext context) {
+    final borderColor =
+        widget.onScannedBoundsColor?.call(_filteredCodes) ?? widget.cutOutBorderColor;
+
     final defaultBorderPaint = Paint()
       ..style = PaintingStyle.stroke
-      ..strokeWidth = 5 // strokeWidth is painted 50/50 outwards and inwards.
-      ..color = widget.cutOutBorderColor;
+      ..strokeWidth = 5
+      ..color = borderColor;
 
     final sensingBorderPaint = Paint()
       ..style = PaintingStyle.stroke
-      ..strokeWidth = 5; // strokeWidth is painted 50/50 outwards and inwards.
+      ..strokeWidth = 5;
 
     return RepaintBoundary(
       child: SizedBox.expand(
@@ -113,24 +214,22 @@ class MaterialPreviewOverlayState extends State<MaterialPreviewOverlay>
               painter: MaterialFinderPainter(
                 borderPaint: defaultBorderPaint,
                 backgroundColor: widget.backgroundColor,
-                cutOutShape: widget.cutOutShape,
+                rectOfInterest: widget.rectOfInterest,
               ),
             ),
-            if (widget.showSensing)
-              AnimatedBuilder(
-                animation: _controller,
-                builder: (context, child) => CustomPaint(
-                  foregroundPainter: MaterialFinderPainter(
-                    inflate: _inflateSequence.value,
-                    opacity: _opacitySequence.value,
-                    sensingColor: widget.sensingColor,
-                    drawBackground: false,
-                    borderPaint: sensingBorderPaint,
-                    backgroundColor: widget.backgroundColor,
-                    cutOutShape: widget.cutOutShape,
-                  ),
+            AnimatedBuilder(
+              animation: _controller,
+              builder: (context, child) => CustomPaint(
+                foregroundPainter: MaterialFinderPainter(
+                  inflate: _inflateAnimation.value,
+                  opacity: _opacityAnimation.value,
+                  sensingColor: widget.sensingColor,
+                  borderPaint: sensingBorderPaint,
+                  backgroundColor: widget.backgroundColor,
+                  rectOfInterest: widget.rectOfInterest,
                 ),
-              )
+              ),
+            )
           ],
         ),
       ),
diff --git a/fast_barcode_scanner/lib/src/overlays/material_finder_overlay/material_finder_painter.dart b/fast_barcode_scanner/lib/src/overlays/material_finder_overlay/material_finder_painter.dart
index f9dc2872..237e74f8 100644
--- a/fast_barcode_scanner/lib/src/overlays/material_finder_overlay/material_finder_painter.dart
+++ b/fast_barcode_scanner/lib/src/overlays/material_finder_overlay/material_finder_painter.dart
@@ -1,46 +1,34 @@
-import 'package:fast_barcode_scanner/fast_barcode_scanner.dart';
+import 'package:fast_barcode_scanner/src/overlays/rect_of_interest.dart';
 import 'package:flutter/material.dart';
 
+import '../../../fast_barcode_scanner.dart';
+
+/// The MaterialFinderPainter draws a box around the [rectOfInterest] as well as
+/// an optional "scan line" as a guide for the user to locate the desired code
+/// to scan.
 class MaterialFinderPainter extends CustomPainter {
   MaterialFinderPainter({
+    required this.borderPaint,
+    required this.backgroundColor,
+    required this.rectOfInterest,
     this.inflate = 0.0,
     this.opacity = 1.0,
     this.sensingColor = Colors.white,
-    this.drawBackground = true,
-    required this.borderPaint,
-    required this.backgroundColor,
-    required this.cutOutShape,
   });
 
   final double inflate;
   final double opacity;
   final Color sensingColor;
-  final bool drawBackground;
   final Paint borderPaint;
-  final Color backgroundColor;
-  final CutOutShape cutOutShape;
+  final Color? backgroundColor;
+  final RectOfInterest rectOfInterest;
 
   @override
   void paint(Canvas canvas, Size size) {
-    final backgroundPaint = Paint()..color = backgroundColor;
-
     final screenRect = Rect.fromLTWH(0, 0, size.width, size.height);
 
-    final cutOutWidth = screenRect.width - 45;
-
-    double cutOutHeight;
-    if (cutOutShape == CutOutShape.square) {
-      cutOutHeight = cutOutWidth;
-    } else {
-      cutOutHeight = 1 / (16 / 9) * cutOutWidth;
-    }
-
     final cutOut = RRect.fromRectXY(
-      Rect.fromCenter(
-        center: screenRect.center,
-        width: cutOutWidth,
-        height: cutOutHeight,
-      ),
+      rectOfInterest.rect(screenRect),
       12,
       12,
     );
@@ -50,7 +38,8 @@ class MaterialFinderPainter extends CustomPainter {
       borderPaint.strokeWidth = 5 - 4 * inflate;
     }
 
-    if (drawBackground) {
+    if (backgroundColor != null) {
+      final backgroundPaint = Paint()..color = backgroundColor!;
       final cutOutPath = Path.combine(
         PathOperation.difference,
         Path()..addRect(screenRect),
@@ -68,8 +57,7 @@ class MaterialFinderPainter extends CustomPainter {
 
   /// Inflates a rect, but keeps the border radius.
   RRect _inflate(RRect rect) {
-    return RRect.fromRectAndRadius(
-        rect.outerRect.inflate(inflate * 20), rect.blRadius);
+    return RRect.fromRectAndRadius(rect.outerRect.inflate(inflate * 20), rect.blRadius);
   }
 
   @override
@@ -78,7 +66,6 @@ class MaterialFinderPainter extends CustomPainter {
         oldDelegate.inflate != inflate ||
         oldDelegate.sensingColor != sensingColor ||
         oldDelegate.borderPaint != borderPaint ||
-        oldDelegate.backgroundColor != backgroundColor ||
-        oldDelegate.cutOutShape != cutOutShape;
+        oldDelegate.backgroundColor != backgroundColor;
   }
 }
diff --git a/fast_barcode_scanner/lib/src/overlays/overlays.dart b/fast_barcode_scanner/lib/src/overlays/overlays.dart
new file mode 100644
index 00000000..3bed16ef
--- /dev/null
+++ b/fast_barcode_scanner/lib/src/overlays/overlays.dart
@@ -0,0 +1,4 @@
+export 'code_boundary_overlay/code_boundary_overlay.dart';
+export 'material_finder_overlay/material_finder_overlay.dart';
+export 'rect_of_interest.dart';
+export 'blur_overlay.dart';
diff --git a/fast_barcode_scanner/lib/src/overlays/rect_of_interest.dart b/fast_barcode_scanner/lib/src/overlays/rect_of_interest.dart
new file mode 100644
index 00000000..3d059a5a
--- /dev/null
+++ b/fast_barcode_scanner/lib/src/overlays/rect_of_interest.dart
@@ -0,0 +1,135 @@
+import 'dart:ui';
+
+import 'package:fast_barcode_scanner_platform_interface/fast_barcode_scanner_platform_interface.dart';
+
+import '../corner_point_utils.dart';
+
+typedef CodeFilter = bool Function(Barcode code);
+
+/// A simple description of a rect of interest. The Rect will be located in the
+/// center of the screen and will fill the width minus horizontal padding.
+abstract class RectOfInterest {
+  const RectOfInterest();
+
+  static RectOfInterest wide({double horizontalPadding = 45}) =>
+      WideRectOfInterest(horizontalPadding: horizontalPadding);
+
+  static RectOfInterest square({required double size}) =>
+      SquareRectOfInterest(size: size);
+
+  Rect rect(Rect previewWidgetRect);
+
+  /// A curried function which is used for filtering scanned codes based on the
+  /// bounds of the [RectOfInterest].
+  CodeFilter buildCodeFilter({
+    required Size analysisSize,
+    required Size previewSize,
+  }) {
+    return (code) {
+      if (code.boundingBox != null) {
+        final cornerPoints = [
+          code.boundingBox!.topLeft,
+          code.boundingBox!.bottomRight
+        ];
+        for (final cornerPoint in cornerPoints) {
+          final scaledCornerOffset = scaleCodeCornerPoint(
+            cornerPoint: cornerPoint.toOffset(),
+            analysisImageSize: analysisSize,
+            widgetSize: previewSize,
+          );
+          if (!rect(previewSize.toRect()).contains(scaledCornerOffset)) {
+            // this code is not completely contained in the rect of interest
+            return false;
+          }
+        }
+        return true;
+      } else {
+        return false;
+      }
+    };
+  }
+
+  List<Barcode> filterCodes({
+    required List<Barcode> codes,
+    required Size analysisSize,
+    required Size previewSize,
+  }) {
+    return codes.where((code) {
+      if (code.boundingBox != null) {
+        final cornerPoints = [
+          code.boundingBox!.topLeft,
+          code.boundingBox!.bottomRight
+        ];
+        for (final cornerPoint in cornerPoints) {
+          final scaledCornerOffset = scaleCodeCornerPoint(
+            cornerPoint: cornerPoint.toOffset(),
+            analysisImageSize: analysisSize,
+            widgetSize: previewSize,
+          );
+          if (!rect(previewSize.toRect()).contains(scaledCornerOffset)) {
+            // this code is not completely contained in the rect of interest
+            return false;
+          }
+        }
+        return true;
+      } else {
+        return false;
+      }
+    }).toList();
+  }
+}
+
+class WideRectOfInterest extends RectOfInterest {
+  final double horizontalPadding;
+
+  const WideRectOfInterest({this.horizontalPadding = 45});
+
+  /// The rect of interest should be in the center of the screen
+  ///
+  /// on iOS AVFoundation will only recognize linear codes like Code128 when
+  /// they are exactly in the exact center of the image when it is configured
+  /// to recognize both linear and 2D barcodes. When you only want linear codes
+  /// then this doesn't apply while using modern hardware.
+  @override
+  Rect rect(Rect previewWidgetSize) {
+    final width = previewWidgetSize.width - horizontalPadding;
+    final height = 1 / (16 / 9) * width;
+    return Rect.fromCenter(
+      center: previewWidgetSize.center,
+      width: width,
+      height: height,
+    );
+  }
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is WideRectOfInterest &&
+          runtimeType == other.runtimeType &&
+          horizontalPadding == other.horizontalPadding;
+}
+
+class SquareRectOfInterest extends RectOfInterest {
+  final double size;
+
+  const SquareRectOfInterest({required this.size});
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is SquareRectOfInterest &&
+          runtimeType == other.runtimeType &&
+          size == other.size;
+
+  @override
+  int get hashCode => size.hashCode;
+
+  @override
+  Rect rect(Rect previewWidgetRect) {
+    return Rect.fromCenter(
+      center: previewWidgetRect.center,
+      width: size,
+      height: size,
+    );
+  }
+}
diff --git a/fast_barcode_scanner/lib/src/types/scanned_barcodes.dart b/fast_barcode_scanner/lib/src/types/scanned_barcodes.dart
index 04472290..a4542a41 100644
--- a/fast_barcode_scanner/lib/src/types/scanned_barcodes.dart
+++ b/fast_barcode_scanner/lib/src/types/scanned_barcodes.dart
@@ -6,8 +6,6 @@ class ScannedBarcodes {
 
   ScannedBarcodes(this.barcodes) : scannedAt = DateTime.now();
 
-  ScannedBarcodes.none() : this([]);
-
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
diff --git a/fast_barcode_scanner/pubspec.yaml b/fast_barcode_scanner/pubspec.yaml
index 1c31c556..72e9179d 100644
--- a/fast_barcode_scanner/pubspec.yaml
+++ b/fast_barcode_scanner/pubspec.yaml
@@ -1,26 +1,25 @@
 name: fast_barcode_scanner
 description: A fast barcode scanner using MLKit on Android and AVFoundation on iOS.
-version: 2.0.0-dev.3
-homepage: https://github.com/jhoogstraat/fast_barcode_scanner
+version: 2.0.1
+#remove this before we publish
 publish_to: none
+homepage: https://github.com/jhoogstraat/fast_barcode_scanner
 repository: https://github.com/jhoogstraat/fast_barcode_scanner
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
-  flutter: ">=2.0.0"
+  sdk: ">=3.3.4 <4.0.0"
+  flutter: ">=3.3.0"
 
 dependencies:
   flutter:
     sdk: flutter
   fast_barcode_scanner_platform_interface:
-    git:
-      url: https://github.com/jhoogstraat/fast_barcode_scanner
-      ref: develop
-      path: fast_barcode_scanner_platform_interface
+    path: ../fast_barcode_scanner_platform_interface
+
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^1.0.4
+  flutter_lints: ^3.0.1
 
 flutter:
   plugin:
diff --git a/fast_barcode_scanner/test/camera_controller_test.dart b/fast_barcode_scanner/test/camera_controller_test.dart
index bce9dcff..c96dc250 100644
--- a/fast_barcode_scanner/test/camera_controller_test.dart
+++ b/fast_barcode_scanner/test/camera_controller_test.dart
@@ -7,13 +7,15 @@ void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
 
   setUp(() {
-    channel.setMockMethodCallHandler((MethodCall methodCall) async {
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+        .setMockMethodCallHandler(channel, (_) async {
       return '42';
     });
   });
 
   tearDown(() {
-    channel.setMockMethodCallHandler(null);
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+        .setMockMethodCallHandler(channel, null);
   });
 
   test('getPlatformVersion', () async {
diff --git a/fast_barcode_scanner_platform_interface/lib/src/fast_barcode_scanner_platform_interface.dart b/fast_barcode_scanner_platform_interface/lib/src/fast_barcode_scanner_platform_interface.dart
index a3961a77..fa724113 100644
--- a/fast_barcode_scanner_platform_interface/lib/src/fast_barcode_scanner_platform_interface.dart
+++ b/fast_barcode_scanner_platform_interface/lib/src/fast_barcode_scanner_platform_interface.dart
@@ -1,17 +1,17 @@
 import 'package:fast_barcode_scanner_platform_interface/src/types/image_source.dart';
 import 'package:plugin_platform_interface/plugin_platform_interface.dart';
 
+import 'method_channel_fast_barcode_scanner.dart';
 import 'types/barcode.dart';
 import 'types/barcode_type.dart';
 import 'types/preview_configuration.dart';
-import 'method_channel_fast_barcode_scanner.dart';
 
 /// Callback handler method for receiving scanned codes.
 typedef OnDetectionHandler = void Function(List<Barcode>);
 
 /// The interface that implementations of fast_barcode_scanner must implement.
 ///
-/// Platform implementations should extend this class rather than implement it as `fast_barcode_scanner`
+/// Platform implementations should extend this class rather than implement it.
 /// Extending this class (using `extends`) ensures that the subclass will get the default implementation, while
 /// platform implementations that `implements` this interface will be broken by newly added
 /// [FastBarcodeScannerPlatform] methods.
@@ -20,8 +20,7 @@ abstract class FastBarcodeScannerPlatform extends PlatformInterface {
 
   static const Object _token = Object();
 
-  static FastBarcodeScannerPlatform _instance =
-      MethodChannelFastBarcodeScanner();
+  static FastBarcodeScannerPlatform _instance = MethodChannelFastBarcodeScanner();
 
   /// The default instance of [FastBarcodeScannerPlatform] to use.
   ///
@@ -37,12 +36,9 @@ abstract class FastBarcodeScannerPlatform extends PlatformInterface {
 
   /// Initializes and starts the native camera interface.
   /// Returns a [PreviewConfiguration] the camera is setup with.
-  Future<PreviewConfiguration> init(
-      List<BarcodeType> types,
-      Resolution resolution,
-      Framerate framerate,
-      DetectionMode detectionMode,
-      CameraPosition position) {
+  Future<PreviewConfiguration> init(List<BarcodeType> types, Resolution resolution,
+      Framerate framerate, DetectionMode detectionMode, CameraPosition position,
+      {ApiMode? apiMode}) {
     throw UnimplementedError('init() has not been implemented');
   }
 
diff --git a/fast_barcode_scanner_platform_interface/lib/src/method_channel_fast_barcode_scanner.dart b/fast_barcode_scanner_platform_interface/lib/src/method_channel_fast_barcode_scanner.dart
index 6eb0c53b..ee58e315 100644
--- a/fast_barcode_scanner_platform_interface/lib/src/method_channel_fast_barcode_scanner.dart
+++ b/fast_barcode_scanner_platform_interface/lib/src/method_channel_fast_barcode_scanner.dart
@@ -9,29 +9,31 @@ import 'types/barcode_type.dart';
 import 'types/preview_configuration.dart';
 
 class MethodChannelFastBarcodeScanner extends FastBarcodeScannerPlatform {
-  static const MethodChannel _channel =
-      MethodChannel('com.jhoogstraat/fast_barcode_scanner');
-  static const EventChannel _detectionEvents =
+  static const MethodChannel _channel = MethodChannel('com.jhoogstraat/fast_barcode_scanner');
+
+  static const EventChannel _detectionEventsChannel =
       EventChannel('com.jhoogstraat/fast_barcode_scanner/detections');
 
-  final Stream<dynamic> _detectionEventStream =
-      _detectionEvents.receiveBroadcastStream();
+  final Stream<dynamic> _detectionEventStream = _detectionEventsChannel.receiveBroadcastStream();
   StreamSubscription<dynamic>? _barcodeEventStreamSubscription;
   OnDetectionHandler? _onDetectHandler;
 
   @override
   Future<PreviewConfiguration> init(
-      List<BarcodeType> types,
-      Resolution resolution,
-      Framerate framerate,
-      DetectionMode detectionMode,
-      CameraPosition position) async {
+    List<BarcodeType> types,
+    Resolution resolution,
+    Framerate framerate,
+    DetectionMode detectionMode,
+    CameraPosition position, {
+    ApiMode? apiMode,
+  }) async {
     final response = await _channel.invokeMethod('init', {
       'types': types.map((e) => e.name).toList(growable: false),
       'mode': detectionMode.name,
       'res': resolution.name,
       'fps': framerate.name,
-      'pos': position.name
+      'pos': position.name,
+      ...apiMode?.configMap ?? {},
     });
     return PreviewConfiguration(response);
   }
@@ -39,8 +41,8 @@ class MethodChannelFastBarcodeScanner extends FastBarcodeScannerPlatform {
   @override
   void setOnDetectHandler(OnDetectionHandler handler) async {
     _onDetectHandler = handler;
-    _barcodeEventStreamSubscription ??=
-        _detectionEventStream.listen(_handlePlatformBarcodeEvent);
+    _barcodeEventStreamSubscription ??= _detectionEventStream.listen(_handlePlatformBarcodeEvent);
+    print("register barcode handler");
   }
 
   @override
@@ -64,8 +66,7 @@ class MethodChannelFastBarcodeScanner extends FastBarcodeScannerPlatform {
   }
 
   @override
-  Future<bool> toggleTorch() =>
-      _channel.invokeMethod('torch').then<bool>((isOn) => isOn);
+  Future<bool> toggleTorch() => _channel.invokeMethod('torch').then((isOn) => isOn);
 
   @override
   Future<PreviewConfiguration> changeConfiguration({
diff --git a/fast_barcode_scanner_platform_interface/lib/src/types/barcode.dart b/fast_barcode_scanner_platform_interface/lib/src/types/barcode.dart
index 8b9deeff..66b57bf1 100644
--- a/fast_barcode_scanner_platform_interface/lib/src/types/barcode.dart
+++ b/fast_barcode_scanner_platform_interface/lib/src/types/barcode.dart
@@ -1,22 +1,19 @@
 import 'dart:math';
 
-import 'package:flutter/foundation.dart';
-
 import '../../fast_barcode_scanner_platform_interface.dart';
+import 'barcode_type.dart';
+import 'barcode_value_type.dart';
 
 /// Describes a Barcode with type and value.
 /// [Barcode] is value-equatable.
 class Barcode {
   /// Creates a [Barcode] from a Flutter Message Protocol
   Barcode(List<dynamic> data)
-      : type = BarcodeType.values.firstWhere((e) => describeEnum(e) == data[0]),
+      : type = BarcodeType.values.firstWhere((e) => e.name == data[0]),
         value = data[1],
-        valueType = data.length > 2
-            ? data[2] != null
-                ? BarcodeValueType.values[data[2]]
-                : null
-            : null,
-        cornerPoints = data.length > 3 ? parsePointList(data[3]) : null;
+        valueType = data[2] != null ? BarcodeValueType.values[data[2]] : null,
+        boundingBox = null;
+  // boundingBox = parsePoints(data.sublist(3).cast<List<double>>());
 
   /// The type of the barcode.
   ///
@@ -35,11 +32,13 @@ class Barcode {
   final BarcodeValueType? valueType;
 
   /// The corners of the visible barcode. This can be used for custom drawing.
-  final List<Point>? cornerPoints;
+  final Rectangle? boundingBox;
 
-  static List<Point<int>>? parsePointList(List<dynamic>? pointList) {
-    return pointList?.map((e) => Point<int>(e[0], e[1])).toList();
-  }
+  // static Rectangle? parsePoints(List<Object?> pointList) {
+  //   final topLeft = Point(pointList[0][0], pointList[0][1]);
+  //   final bottomRight = Point(pointList[3][0], pointList[3][1]);
+  //   return Rectangle.fromPoints(topLeft, bottomRight);
+  // }
 
   @override
   bool operator ==(Object other) =>
@@ -47,15 +46,11 @@ class Barcode {
       other.type == type &&
       other.value == value &&
       other.valueType == valueType &&
-      other.cornerPoints == cornerPoints;
+      other.boundingBox == boundingBox;
 
   @override
   int get hashCode =>
-      super.hashCode ^
-      type.hashCode ^
-      value.hashCode ^
-      valueType.hashCode ^
-      cornerPoints.hashCode;
+      super.hashCode ^ type.hashCode ^ value.hashCode ^ valueType.hashCode ^ boundingBox.hashCode;
 
   @override
   String toString() {
@@ -64,7 +59,7 @@ class Barcode {
       type: $type,
       value: $value,
       valueType: $valueType,
-      rect: $cornerPoints
+      rect: $boundingBox
     }
     ''';
   }
diff --git a/fast_barcode_scanner_platform_interface/lib/src/types/barcode_type.dart b/fast_barcode_scanner_platform_interface/lib/src/types/barcode_type.dart
index 7b145c43..dc54dce8 100644
--- a/fast_barcode_scanner_platform_interface/lib/src/types/barcode_type.dart
+++ b/fast_barcode_scanner_platform_interface/lib/src/types/barcode_type.dart
@@ -1,5 +1,3 @@
-import 'package:flutter/foundation.dart';
-
 /// Contains all currently on iOS and Android supported barcode types.
 enum BarcodeType {
   /// Android, iOS
@@ -47,7 +45,3 @@ enum BarcodeType {
   /// iOS
   interleaved,
 }
-
-extension BarcodeTypeName on BarcodeType {
-  String get name => describeEnum(this);
-}
diff --git a/fast_barcode_scanner_platform_interface/lib/src/types/barcode_value_type.dart b/fast_barcode_scanner_platform_interface/lib/src/types/barcode_value_type.dart
index 8bf1384c..46f9f4af 100644
--- a/fast_barcode_scanner_platform_interface/lib/src/types/barcode_value_type.dart
+++ b/fast_barcode_scanner_platform_interface/lib/src/types/barcode_value_type.dart
@@ -1,5 +1,3 @@
-import 'package:flutter/foundation.dart';
-
 /// Contains all currently supported barcode value types.
 /// see https://developers.google.com/android/reference/com/google/mlkit/vision/barcode/Barcode.BarcodeValueType
 enum BarcodeValueType {
@@ -17,7 +15,3 @@ enum BarcodeValueType {
   calender,
   license
 }
-
-extension BarcodeValueTypeName on BarcodeValueType {
-  String get name => describeEnum(this);
-}
diff --git a/fast_barcode_scanner_platform_interface/lib/src/types/preview_configuration.dart b/fast_barcode_scanner_platform_interface/lib/src/types/preview_configuration.dart
index 258aa75a..4a1b0c05 100644
--- a/fast_barcode_scanner_platform_interface/lib/src/types/preview_configuration.dart
+++ b/fast_barcode_scanner_platform_interface/lib/src/types/preview_configuration.dart
@@ -3,17 +3,9 @@ import 'package:flutter/foundation.dart';
 /// Supported resolutions. Not all devices support all resolutions!
 enum Resolution { sd480, hd720, hd1080, hd4k }
 
-extension ResolutionName on Resolution {
-  String get name => describeEnum(this);
-}
-
 /// Supported Framerates. Not all devices support all framerates!
 enum Framerate { fps30, fps60, fps120, fps240 }
 
-extension FramerateName on Framerate {
-  String get name => describeEnum(this);
-}
-
 /// Dictates how the camera reacts to detections
 enum DetectionMode {
   /// Pauses the detection of further barcodes when a barcode is detected.
@@ -28,17 +20,9 @@ enum DetectionMode {
   continuous
 }
 
-extension DetectionModeName on DetectionMode {
-  String get name => describeEnum(this);
-}
-
 /// The position of the camera.
 enum CameraPosition { front, back }
 
-extension CameraPositionName on CameraPosition {
-  String get name => describeEnum(this);
-}
-
 /// The configuration by which the camera feed can be laid out in the UI.
 class PreviewConfiguration {
   /// The width of the camera feed in points.
@@ -102,3 +86,32 @@ class PreviewConfiguration {
     return 'PreviewConfiguration{width: $width, height: $height, targetRotation: $targetRotation, textureId: $textureId, analysisResolution: $analysisResolution, analysisWidth: $analysisWidth, analysisHeight: $analysisHeight}';
   }
 }
+
+abstract class ApiMode {
+  const ApiMode();
+
+  String get name;
+
+  Map<String, dynamic> get configMap => {
+        "apiMode": name,
+        ...config,
+      };
+
+  Map<String, dynamic> get config => {};
+}
+
+class AppleApiMode extends ApiMode {
+  @override
+  final String name;
+
+  @override
+  final Map<String, dynamic> config;
+
+  const AppleApiMode.avFoundation()
+      : name = "avFoundation",
+        config = const {};
+
+  AppleApiMode.vision(double confidence)
+      : name = "vision",
+        config = {"confidence": clampDouble(confidence, 0, 1)};
+}
diff --git a/fast_barcode_scanner_platform_interface/pubspec.yaml b/fast_barcode_scanner_platform_interface/pubspec.yaml
index 7ba866b6..e1b92f18 100644
--- a/fast_barcode_scanner_platform_interface/pubspec.yaml
+++ b/fast_barcode_scanner_platform_interface/pubspec.yaml
@@ -2,18 +2,18 @@ name: fast_barcode_scanner_platform_interface
 description: A common platform interface for the fast_barcode_scanner plugin.
 homepage: https://github.com/jhoogstraat/fast_barcode_scanner/tree/master/fast_barcode_scanner_platform_interface
 repository: https://github.com/jhoogstraat/fast_barcode_scanner
-version: 2.0.0-dev.3
+version: 2.0.0-dev.4
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
-  flutter: ">=2.0.0"
+  sdk: ">=3.3.4 <4.0.0"
+  flutter: ">=3.3.0"
 
 dependencies:
   flutter:
     sdk: flutter
-  plugin_platform_interface: ^2.0.1
+  plugin_platform_interface: ^2.1.7
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^1.0.4
+  flutter_lints: ^3.0.1
diff --git a/fast_barcode_scanner_platform_interface/test/types/barcode_test.dart b/fast_barcode_scanner_platform_interface/test/types/barcode_test.dart
index d5a4d1de..2de512cc 100644
--- a/fast_barcode_scanner_platform_interface/test/types/barcode_test.dart
+++ b/fast_barcode_scanner_platform_interface/test/types/barcode_test.dart
@@ -28,7 +28,7 @@ void main() {
       ]
     ]);
 
-    expect(barcodeQR.cornerPoints, [
+    expect(barcodeQR.boundingBox, [
       const Point(1, 2),
       const Point(3, 4),
       const Point(5, 6),
diff --git a/fast_barcode_scanner_platform_interface/test/utils/method_channel_mock.dart b/fast_barcode_scanner_platform_interface/test/utils/method_channel_mock.dart
index 05efd2c6..316e9a37 100644
--- a/fast_barcode_scanner_platform_interface/test/utils/method_channel_mock.dart
+++ b/fast_barcode_scanner_platform_interface/test/utils/method_channel_mock.dart
@@ -3,7 +3,7 @@ import 'package:flutter_test/flutter_test.dart';
 
 class MethodChannelMock {
   final Duration? delay;
-  final MethodChannel methodChannel;
+  final MethodChannel channel;
   final Map<String, dynamic> methods;
   final log = <MethodCall>[];
 
@@ -11,8 +11,9 @@ class MethodChannelMock {
     required String channelName,
     this.delay,
     required this.methods,
-  }) : methodChannel = MethodChannel(channelName) {
-    methodChannel.setMockMethodCallHandler(_handler);
+  }) : channel = MethodChannel(channelName) {
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+        .setMockMethodCallHandler(channel, _handler);
   }
 
   Future _handler(MethodCall methodCall) async {
@@ -20,7 +21,7 @@ class MethodChannelMock {
 
     if (!methods.containsKey(methodCall.method)) {
       throw MissingPluginException('No implementation found for method '
-          '${methodCall.method} on channel ${methodChannel.name}');
+          '${methodCall.method} on channel ${channel.name}');
     }
 
     return Future.delayed(delay ?? Duration.zero, () {