diff --git a/samples/kotlin/face/FaceAnalyzerSample/README.md b/samples/kotlin/face/FaceAnalyzerSample/README.md
index eff5b2e..c937160 100644
--- a/samples/kotlin/face/FaceAnalyzerSample/README.md
+++ b/samples/kotlin/face/FaceAnalyzerSample/README.md
@@ -144,8 +144,8 @@ plugins {
 ```
 * You need to add the following dependencies to apps' build.grade `dependencies` section.
 ```
-    implementation "com.azure.ai:azure-ai-vision-common:0.17.0-beta.1"
-    implementation "com.azure.ai:azure-ai-vision-faceanalyzer:0.17.0-beta.1"
+    implementation "com.azure.ai:azure-ai-vision-common:0.17.1-beta.1"
+    implementation "com.azure.ai:azure-ai-vision-faceanalyzer:0.17.1-beta.1"
 ```
 * You need to add repository in the settings.gradle for dependencyResolutionManagement
 ```
diff --git a/samples/kotlin/face/FaceAnalyzerSample/app/build.gradle b/samples/kotlin/face/FaceAnalyzerSample/app/build.gradle
index b98c79b..7bc1f0e 100644
--- a/samples/kotlin/face/FaceAnalyzerSample/app/build.gradle
+++ b/samples/kotlin/face/FaceAnalyzerSample/app/build.gradle
@@ -38,10 +38,10 @@ android {
 }
 
 dependencies {
-    implementation group: 'net.sourceforge.streamsupport', name: 'android-retrofuture', version: '1.7.4'
-    implementation 'com.google.android.material:material:1.12.0'
+    implementation 'com.google.android.material:material:1.9.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation "androidx.activity:activity-ktx:1.9.0"
-    implementation "com.azure.ai:azure-ai-vision-faceanalyzer:0.17.0-beta.1"
-    implementation "com.azure.android:azure-core-http-okhttp:1.0.0-beta.14"
-}
+    implementation 'com.azure.android:azure-core-http-okhttp:1.0.0-beta.14'
+    implementation "androidx.activity:activity-ktx:1.7.2"
+    implementation "com.azure.ai:azure-ai-vision-common:0.17.1-beta.1"
+    implementation "com.azure.ai:azure-ai-vision-faceanalyzer:0.17.1-beta.1"
+}
\ No newline at end of file
diff --git a/samples/kotlin/face/FaceAnalyzerSample/app/src/main/AndroidManifest.xml b/samples/kotlin/face/FaceAnalyzerSample/app/src/main/AndroidManifest.xml
index 891b6f0..e5681fd 100644
--- a/samples/kotlin/face/FaceAnalyzerSample/app/src/main/AndroidManifest.xml
+++ b/samples/kotlin/face/FaceAnalyzerSample/app/src/main/AndroidManifest.xml
@@ -50,4 +50,4 @@
         </activity>
     </application>
 
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/samples/kotlin/face/FaceAnalyzerSample/app/src/main/java/com/example/FaceAnalyzerSample/AnalyzeActivity.kt b/samples/kotlin/face/FaceAnalyzerSample/app/src/main/java/com/example/FaceAnalyzerSample/AnalyzeActivity.kt
index e35305d..d72ae50 100644
--- a/samples/kotlin/face/FaceAnalyzerSample/app/src/main/java/com/example/FaceAnalyzerSample/AnalyzeActivity.kt
+++ b/samples/kotlin/face/FaceAnalyzerSample/app/src/main/java/com/example/FaceAnalyzerSample/AnalyzeActivity.kt
@@ -29,32 +29,32 @@ import com.azure.android.core.credential.AccessToken
 import com.azure.android.core.credential.TokenCredential
 import com.azure.android.core.credential.TokenRequestContext
 import org.threeten.bp.OffsetDateTime
-import java.net.URL
 import kotlin.math.sqrt
-/***
- * Sample class to fetch token for starting liveness session.
- * It is recommended to fetch this token from app server for production as part of init section.
- */
-class StringTokenCredential(token: String) : TokenCredential {
-    override fun getToken(
-        request: TokenRequestContext,
-        callback: TokenCredential.TokenCredentialCallback
-    ) {
-        callback.onSuccess(_token)
-    }
-
-    private var _token: AccessToken? = null
-
-    init {
-        _token = AccessToken(token, OffsetDateTime.MAX)
-    }
-}
 
 /***
  * Analyze activity performs one-time face analysis, using the default camera stream as input.
  * Launches the result activity once the analyzed event is triggered.
  */
 open class AnalyzeActivity : AppCompatActivity() {
+    /***
+     * Sample class to fetch token for starting liveness session.
+     * It is recommended to fetch this token from app server for production as part of init section.
+     */
+    class StringTokenCredential(token: String) : TokenCredential {
+        override fun getToken(
+            request: TokenRequestContext,
+            callback: TokenCredential.TokenCredentialCallback
+        ) {
+            callback.onSuccess(_token)
+        }
+
+        private var _token: AccessToken? = null
+
+        init {
+            _token = AccessToken(token, OffsetDateTime.MAX)
+        }
+    }
+
     private lateinit var mSurfaceView: SurfaceView
     private lateinit var mCameraPreviewLayout: FrameLayout
     private lateinit var mBackgroundLayout: ConstraintLayout
@@ -81,12 +81,12 @@ open class AnalyzeActivity : AppCompatActivity() {
         mCameraPreviewLayout.removeAllViews()
         mCameraPreviewLayout.addView(mSurfaceView)
         mCameraPreviewLayout.visibility = View.INVISIBLE
-        mInstructionsView = findViewById(R.id.instructionString);
+        mInstructionsView = findViewById(R.id.instructionString)
         mBackgroundLayout = findViewById(R.id.activity_main_layout)
-        var analyzeModel = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        val analyzeModel = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
             intent.getParcelableExtra("model", AnalyzeModel::class.java)
         } else {
-            @Suppress("DEPRECATION") intent.getParcelableExtra<AnalyzeModel>("model")
+            @Suppress("DEPRECATION") intent.getParcelableExtra("model")
         }
         mFaceApiEndpoint = analyzeModel?.endpoint
         mSessionToken = analyzeModel?.token
@@ -99,14 +99,16 @@ open class AnalyzeActivity : AppCompatActivity() {
 
     override fun onResume() {
         super.onResume()
-        initializeConfig()
-        val visionSourceOptions = VisionSourceOptions(this, this as LifecycleOwner)
-        visionSourceOptions.setPreview(mSurfaceView)
-        mVisionSource = VisionSource.fromDefaultCamera(visionSourceOptions)
-        displayCameraOnLayout()
-
-        // Initialize faceAnalyzer with default camera as vision source
-        createFaceAnalyzer()
+        if (mFaceAnalyzer == null) {
+            initializeConfig()
+            val visionSourceOptions = VisionSourceOptions(this, this as LifecycleOwner)
+            visionSourceOptions.setPreview(mSurfaceView)
+            mVisionSource = VisionSource.fromDefaultCamera(visionSourceOptions)
+            displayCameraOnLayout()
+
+            // Initialize faceAnalyzer with default camera as vision source
+            createFaceAnalyzer()
+        }
         startAnalyzeOnce()
     }
 
@@ -156,39 +158,46 @@ open class AnalyzeActivity : AppCompatActivity() {
 
         mFaceAnalyzer?.apply {
             this.analyzed.addEventListener(analyzedListener)
-            this.analyzing.addEventListener(analyzinglistener)
+            this.analyzing.addEventListener(analyzingListener)
+            this.stopped.addEventListener(stoppedListener)
         }
     }
 
     /**
      * Listener for Analyzing callback. Receives tracking and user feedback information
      */
-    protected var analyzinglistener =
+    @Suppress("MemberVisibilityCanBePrivate")
+    protected var analyzingListener =
         EventListener<FaceAnalyzingEventArgs> { _, e ->
 
             e.result.use { result ->
                 if (result.faces.isNotEmpty()) {
                     // Get the first face in result
-                    var face = result.faces.iterator().next()
+                    val face = result.faces.iterator().next()
 
                     // Lighten/darken the screen based on liveness feedback
-                    var requiredAction = face.actionRequiredFromApplicationTask?.action;
-                    if (requiredAction == ActionRequiredFromApplication.BRIGHTEN_DISPLAY) {
-                        mBackgroundLayout.setBackgroundColor(Color.WHITE)
-                        face.actionRequiredFromApplicationTask.setAsCompleted()
-                    } else if (requiredAction == ActionRequiredFromApplication.DARKEN_DISPLAY) {
-                        mBackgroundLayout.setBackgroundColor(Color.BLACK)
-                        face.actionRequiredFromApplicationTask.setAsCompleted()
-                    } else if (requiredAction == ActionRequiredFromApplication.STOP_CAMERA) {
-                        mCameraPreviewLayout.visibility = View.INVISIBLE
-                        face.actionRequiredFromApplicationTask.setAsCompleted()
+                    val requiredAction = face.actionRequiredFromApplicationTask?.action
+                    when (requiredAction) {
+                        ActionRequiredFromApplication.BRIGHTEN_DISPLAY -> {
+                            mBackgroundLayout.setBackgroundColor(Color.WHITE)
+                            face.actionRequiredFromApplicationTask.setAsCompleted()
+                        }
+                        ActionRequiredFromApplication.DARKEN_DISPLAY -> {
+                            mBackgroundLayout.setBackgroundColor(Color.BLACK)
+                            face.actionRequiredFromApplicationTask.setAsCompleted()
+                        }
+                        ActionRequiredFromApplication.STOP_CAMERA -> {
+                            mCameraPreviewLayout.visibility = View.INVISIBLE
+                            face.actionRequiredFromApplicationTask.setAsCompleted()
+                        }
+                        else -> {}
                     }
 
                     // Display user feedback and warnings on UI
                     if (!mDoneAnalyzing) {
-                        var feedbackMessage = MapFeedbackToMessage(FeedbackForFace.NONE)
+                        var feedbackMessage = mapFeedbackToMessage(FeedbackForFace.NONE)
                         if (face.feedbackForFace != null) {
-                            feedbackMessage = MapFeedbackToMessage(face.feedbackForFace)
+                            feedbackMessage = mapFeedbackToMessage(face.feedbackForFace)
                         }
 
                         val currentTime = System.currentTimeMillis()
@@ -210,18 +219,19 @@ open class AnalyzeActivity : AppCompatActivity() {
      * Receives recognition and liveness result.
      * Launches result activity.
      */
+    @Suppress("MemberVisibilityCanBePrivate")
     protected var analyzedListener =
         EventListener<FaceAnalyzedEventArgs> { _, e ->
             val bd = Bundle()
             e.result.use { result ->
                 if (result.faces.isNotEmpty()) {
                     // Get the first face in result
-                    var face = result.faces.iterator().next()
-                    var livenessStatus: LivenessStatus = face.livenessResult?.livenessStatus?: LivenessStatus.FAILED
-                    var livenessFailureReason = face.livenessResult?.livenessFailureReason?: LivenessFailureReason.NONE
-                    var verifyStatus = face.recognitionResult?.recognitionStatus?:RecognitionStatus.NOT_COMPUTED
-                    var verifyConfidence = face.recognitionResult?.confidence?:Float.NaN
-                    var resultIdsList: ArrayList<String> = ArrayList()
+                    val face = result.faces.iterator().next()
+                    val livenessStatus: LivenessStatus = face.livenessResult?.livenessStatus?: LivenessStatus.FAILED
+                    val livenessFailureReason = face.livenessResult?.livenessFailureReason?: LivenessFailureReason.NONE
+                    val verifyStatus = face.recognitionResult?.recognitionStatus?:RecognitionStatus.NOT_COMPUTED
+                    val verifyConfidence = face.recognitionResult?.confidence?:Float.NaN
+                    val resultIdsList: ArrayList<String> = ArrayList()
                     if (face.livenessResult.resultId != null) {
                         resultIdsList.add(face.livenessResult.resultId.toString())
                     }
@@ -242,6 +252,14 @@ open class AnalyzeActivity : AppCompatActivity() {
             }
         }
 
+    @Suppress("MemberVisibilityCanBePrivate")
+    protected var stoppedListener =
+        EventListener<FaceAnalysisStoppedEventArgs> { _, e ->
+            if (e.reason == FaceAnalysisStoppedReason.ERROR) {
+                mResultReceiver?.send(AnalyzedResultType.ERROR, null)
+            }
+        }
+
     /**
      * Sets faceAnalysisOptions and recognitionMode. Calls analyzeOnce.
      */
@@ -260,12 +278,12 @@ open class AnalyzeActivity : AppCompatActivity() {
             return
         }
 
-        mFaceAnalysisOptions = FaceAnalysisOptions();
+        mFaceAnalysisOptions = FaceAnalysisOptions()
 
         mFaceAnalysisOptions?.setFaceSelectionMode(FaceSelectionMode.LARGEST)
 
         try {
-            mFaceAnalyzer?.analyzeOnceAsync(mFaceAnalysisOptions);
+            mFaceAnalyzer?.analyzeOnceAsync(mFaceAnalysisOptions)
         } catch (ex: Exception) {
             ex.printStackTrace()
         }
@@ -282,7 +300,7 @@ open class AnalyzeActivity : AppCompatActivity() {
      * Displays camera stream on UI in a circular shape.
      */
     private fun displayCameraOnLayout() {
-        val previewSize = mVisionSource?.getCameraPreviewFormat()
+        val previewSize = mVisionSource?.cameraPreviewFormat
         val params = mCameraPreviewLayout.layoutParams as ConstraintLayout.LayoutParams
         params.dimensionRatio = previewSize?.height.toString() + ":" + previewSize?.width
         params.width = ConstraintLayout.LayoutParams.MATCH_CONSTRAINT
@@ -295,17 +313,18 @@ open class AnalyzeActivity : AppCompatActivity() {
     /**
      * Override back button to always return to main activity
      */
+    @Deprecated("Deprecated in Java")
     override fun onBackPressed() {
         synchronized(this) {
             mBackPressed = true
         }
         @Suppress("DEPRECATION") super.onBackPressed()
-        mFaceAnalyzer?.stopAnalyzeOnce();
+        mFaceAnalyzer?.stopAnalyzeOnce()
         val bd = Bundle()
         mResultReceiver?.send(AnalyzedResultType.BACKPRESSED, bd)
     }
 
-    private fun MapFeedbackToMessage(feedback : FeedbackForFace): String {
+    private fun mapFeedbackToMessage(feedback : FeedbackForFace): String {
         when(feedback) {
             FeedbackForFace.NONE -> return getString(R.string.feedback_none)
             FeedbackForFace.LOOK_AT_CAMERA -> return getString(R.string.feedback_look_at_camera)
diff --git a/samples/kotlin/face/FaceAnalyzerSample/app/src/main/java/com/example/FaceAnalyzerSample/AppUtils.kt b/samples/kotlin/face/FaceAnalyzerSample/app/src/main/java/com/example/FaceAnalyzerSample/AppUtils.kt
index 66103b6..3487140 100644
--- a/samples/kotlin/face/FaceAnalyzerSample/app/src/main/java/com/example/FaceAnalyzerSample/AppUtils.kt
+++ b/samples/kotlin/face/FaceAnalyzerSample/app/src/main/java/com/example/FaceAnalyzerSample/AppUtils.kt
@@ -8,7 +8,7 @@ import android.content.Intent
 import android.net.Uri
 import androidx.activity.result.PickVisualMediaRequest
 import androidx.activity.result.contract.ActivityResultContracts
-import com.example.FaceAnalyzerSample.app.Utils
+import com.example.FaceAnalyzerSample.Utils
 import java.io.IOException
 import java.io.ByteArrayOutputStream
 
@@ -27,7 +27,7 @@ object AppUtils {
         val faceApiKey = sharedPref.getString("key", "").toString()
         val sendResultsToClient = sharedPref.getBoolean("sendResultsToClient", false)
 
-        Utils.getFaceAPISessionToken(faceApiEndpoint, faceApiKey, verifyImage, sendResultsToClient)
+        Utils.getFaceAPISessionToken(faceApiEndpoint, faceApiKey, verifyImage, sendResultsToClient, context.contentResolver)
     }
     // Function to retrieve a string value from SharedPreferences
     fun getVerifyImage(context: Context, uri: Uri) : ByteArray {
diff --git a/samples/kotlin/face/FaceAnalyzerSample/app/src/main/java/com/example/FaceAnalyzerSample/AutoFitSurfaceView.kt b/samples/kotlin/face/FaceAnalyzerSample/app/src/main/java/com/example/FaceAnalyzerSample/AutoFitSurfaceView.kt
index 6254cdc..8519f31 100644
--- a/samples/kotlin/face/FaceAnalyzerSample/app/src/main/java/com/example/FaceAnalyzerSample/AutoFitSurfaceView.kt
+++ b/samples/kotlin/face/FaceAnalyzerSample/app/src/main/java/com/example/FaceAnalyzerSample/AutoFitSurfaceView.kt
@@ -108,4 +108,4 @@ class AutoFitSurfaceView @JvmOverloads constructor(
             clipToOutline = true
         }
     }
-}
+}
\ No newline at end of file
diff --git a/samples/kotlin/face/FaceAnalyzerSample/app/src/main/java/com/example/FaceAnalyzerSample/MainActivity.kt b/samples/kotlin/face/FaceAnalyzerSample/app/src/main/java/com/example/FaceAnalyzerSample/MainActivity.kt
index 1ab2527..398522b 100644
--- a/samples/kotlin/face/FaceAnalyzerSample/app/src/main/java/com/example/FaceAnalyzerSample/MainActivity.kt
+++ b/samples/kotlin/face/FaceAnalyzerSample/app/src/main/java/com/example/FaceAnalyzerSample/MainActivity.kt
@@ -31,7 +31,7 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
-import com.example.FaceAnalyzerSample.app.Utils
+import com.example.FaceAnalyzerSample.Utils
 import java.io.InputStream
 
 /***
@@ -62,26 +62,9 @@ open class MainActivity : AppCompatActivity() {
         mPickMedia = registerForActivityResult(PickImage()) { uri ->
             if (uri != null) {
                 mVerifyImage = AppUtils.getVerifyImage(this, uri)
-                val orientation = this.applicationContext.contentResolver.query(
-                        MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
-                        arrayOf(MediaStore.Images.ImageColumns.ORIENTATION),
-                        MediaStore.Images.Media._ID + " = ?",
-                        arrayOf(DocumentsContract.getDocumentId(uri).split(":")[1]),
-                        null).use {
-                    return@use if (it == null || it.count != 1 || !it.moveToFirst()) null else
-                        when (it.getInt(0)) {
-                            -270 -> ExifInterface.ORIENTATION_ROTATE_90
-                            -180 -> ExifInterface.ORIENTATION_ROTATE_180
-                            -90 -> ExifInterface.ORIENTATION_ROTATE_270
-                            90 -> ExifInterface.ORIENTATION_ROTATE_90
-                            180 -> ExifInterface.ORIENTATION_ROTATE_180
-                            270 -> ExifInterface.ORIENTATION_ROTATE_270
-                            else -> null
-                        }
-                }
                 this.applicationContext.contentResolver.openInputStream(uri).use { inputStream ->
                     if (inputStream != null) {
-                        showImage(inputStream, orientation)
+                        showImage(inputStream)
                     }
                 }
             }
@@ -95,13 +78,14 @@ open class MainActivity : AppCompatActivity() {
         }
     }
     @SuppressLint("NewApi")
-    private fun showImage(inputStream: InputStream, knownOrientationExifEnum: Int?) {
+    private fun showImage(inputStream: InputStream) {
         var bitmapImage =
             BitmapFactory.decodeStream(inputStream)
 
         try {   // rotate bitmap (best effort)
             val matrix = Matrix()
-            (knownOrientationExifEnum ?: ExifInterface(inputStream).getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL))
+            ExifInterface(inputStream)
+                .getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL)
                 .let { orientation ->
                     when (orientation) {
                         ExifInterface.ORIENTATION_ROTATE_90 -> matrix.postRotate(90F)
diff --git a/samples/kotlin/face/FaceAnalyzerSample/app/src/main/java/com/example/FaceAnalyzerSample/ResultActivity.kt b/samples/kotlin/face/FaceAnalyzerSample/app/src/main/java/com/example/FaceAnalyzerSample/ResultActivity.kt
index 63a2a5a..3b83e4d 100644
--- a/samples/kotlin/face/FaceAnalyzerSample/app/src/main/java/com/example/FaceAnalyzerSample/ResultActivity.kt
+++ b/samples/kotlin/face/FaceAnalyzerSample/app/src/main/java/com/example/FaceAnalyzerSample/ResultActivity.kt
@@ -7,6 +7,7 @@ package com.example.FaceAnalyzerSample
 
 import android.content.Intent
 import android.os.Bundle
+import android.widget.Button
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 
@@ -16,6 +17,7 @@ import androidx.appcompat.app.AppCompatActivity
 class ResultActivity : AppCompatActivity() {
 
     private val viewMap: LinkedHashMap<TextView, TextView> = LinkedHashMap()
+    private lateinit var mRetryButton: Button
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -26,22 +28,22 @@ class ResultActivity : AppCompatActivity() {
         viewMap[findViewById(R.id.resultLabel3)] = findViewById(R.id.resultValue3)
         viewMap[findViewById(R.id.resultLabel4)] = findViewById(R.id.resultValue4)
 
-        var livenessStatus = intent.getStringExtra("livenessStatus")
-        var livenessFailureReason = intent.getStringExtra("livenessFailureReason")
-        var verificationStatus = intent.getStringExtra("verificationStatus")
-        var verificationConfidence = intent.getStringExtra("verificationConfidence")
-        var errorMessage = intent.getStringExtra("error")
+        val livenessStatus = intent.getStringExtra("livenessStatus")
+        val livenessFailureReason = intent.getStringExtra("livenessFailureReason")
+        val verificationStatus = intent.getStringExtra("verificationStatus")
+        val verificationConfidence = intent.getStringExtra("verificationConfidence")
+        val errorMessage = intent.getStringExtra("error")
 
-        var itr = viewMap.entries.iterator()
+        val itr = viewMap.entries.iterator()
         var mapEntry = itr.next()
 
-        if(errorMessage.isNullOrBlank() == false){
+        if(!errorMessage.isNullOrBlank()){
             mapEntry.key.text = "Error:"
             mapEntry.value.text = errorMessage
 
         } else {
             // Display liveness results
-            if (livenessStatus.isNullOrBlank() == false) {
+            if (!livenessStatus.isNullOrBlank()) {
                 mapEntry.key.text = "Liveness status:"
                 mapEntry.value.text = livenessStatus
                 mapEntry = itr.next()
@@ -50,7 +52,7 @@ class ResultActivity : AppCompatActivity() {
                 mapEntry = itr.next()
             }
 
-            if (verificationStatus.isNullOrBlank() == false) {
+            if (!verificationStatus.isNullOrBlank()) {
                 mapEntry.key.text = "Verification status:"
                 mapEntry.value.text = verificationStatus
                 mapEntry = itr.next()
@@ -58,11 +60,15 @@ class ResultActivity : AppCompatActivity() {
                 mapEntry.value.text = verificationConfidence
             }
         }
+
+        mRetryButton = findViewById(R.id.retryButton)
+        mRetryButton.setOnClickListener { @Suppress("DEPRECATION") super.onBackPressed() }
     }
 
     /**
      * Overrides back button to always return to main activity
      */
+    @Deprecated("Deprecated in Java")
     override fun onBackPressed() {
         @Suppress("DEPRECATION") super.onBackPressed()
         for (entry in viewMap.entries) {
diff --git a/samples/kotlin/face/FaceAnalyzerSample/app/src/main/java/com/example/FaceAnalyzerSample/Utils.kt b/samples/kotlin/face/FaceAnalyzerSample/app/src/main/java/com/example/FaceAnalyzerSample/Utils.kt
index 4b861f9..0513588 100644
--- a/samples/kotlin/face/FaceAnalyzerSample/app/src/main/java/com/example/FaceAnalyzerSample/Utils.kt
+++ b/samples/kotlin/face/FaceAnalyzerSample/app/src/main/java/com/example/FaceAnalyzerSample/Utils.kt
@@ -1,5 +1,7 @@
-package com.example.FaceAnalyzerSample.app
+package com.example.FaceAnalyzerSample
 
+import android.annotation.SuppressLint
+import android.content.ContentResolver
 import android.provider.Settings
 import android.util.Log
 import kotlinx.coroutines.Dispatchers
@@ -20,9 +22,11 @@ import java.util.UUID
 
 object Utils {
     var mSessionToken: String = ""
-    const val LINE_FEED = "\r\n"
+    private const val LINE_FEED = "\r\n"
 
-    fun getFaceAPISessionToken(faceApiEndpoint: String, faceApiKey: String, verifyImageArray: ByteArray?, sendResultsToClient: Boolean): String = runBlocking {
+    @OptIn(ExperimentalStdlibApi::class)
+    @SuppressLint("HardwareIds")
+    fun getFaceAPISessionToken(faceApiEndpoint: String, faceApiKey: String, verifyImageArray: ByteArray?, sendResultsToClient: Boolean, contentResolver: ContentResolver): String = runBlocking {
         withContext(Dispatchers.IO) {
             val url: URL?
             var urlConnection: HttpsURLConnection? = null
@@ -34,10 +38,12 @@ object Utils {
                         URL("$faceApiEndpoint/face/v1.1-preview.1/detectLiveness/singleModal/sessions")
                     }
 
+                    val deviceId = Settings.Secure.getString(contentResolver, Settings.Secure.ANDROID_ID).hexToLong()
+
                     val tokenRequest = JSONObject(mapOf(
                         "livenessOperationMode" to "Passive",
                         "sendResultsToClient" to sendResultsToClient,
-                        "deviceCorrelationId" to Settings.Secure.ANDROID_ID
+                        "deviceCorrelationId" to UUID(deviceId, deviceId)
                     )).toString()
                     val charset: Charset = Charset.forName("UTF-8")
                     urlConnection = url.openConnection() as HttpsURLConnection
diff --git a/samples/kotlin/face/FaceAnalyzerSample/app/src/main/res/layout/app_activity_result.xml b/samples/kotlin/face/FaceAnalyzerSample/app/src/main/res/layout/app_activity_result.xml
index 88d43b6..66fd326 100644
--- a/samples/kotlin/face/FaceAnalyzerSample/app/src/main/res/layout/app_activity_result.xml
+++ b/samples/kotlin/face/FaceAnalyzerSample/app/src/main/res/layout/app_activity_result.xml
@@ -110,4 +110,17 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/resultLabel3" />
 
+    <Button
+        android:id="@+id/retryButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Retry"
+        android:visibility="visible"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.8" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/samples/kotlin/face/FaceAnalyzerSample/app/src/main/res/layout/app_activity_settings.xml b/samples/kotlin/face/FaceAnalyzerSample/app/src/main/res/layout/app_activity_settings.xml
index 9210024..38435d7 100644
--- a/samples/kotlin/face/FaceAnalyzerSample/app/src/main/res/layout/app_activity_settings.xml
+++ b/samples/kotlin/face/FaceAnalyzerSample/app/src/main/res/layout/app_activity_settings.xml
@@ -31,19 +31,27 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/textView3" />
 
-            <EditText
-                android:id="@+id/keyText"
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/keyTextLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="30dp"
+                app:passwordToggleEnabled="true"
                 android:layout_marginTop="15dp"
-                android:layout_marginEnd="30dp"
-                android:ems="10"
-                android:hint="00000000000000000000000000000000"
-                android:inputType="textPassword"
-                android:textSize="14sp"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/textView4" />
+                app:layout_constraintTop_toBottomOf="@+id/textView4" >
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/keyText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="30dp"
+                    android:layout_marginTop="15dp"
+                    android:layout_marginEnd="30dp"
+                    android:ems="10"
+                    android:hint="00000000000000000000000000000000"
+                    android:inputType="textPassword"
+                    android:textSize="14sp" />
+            </com.google.android.material.textfield.TextInputLayout>
 
             <TextView
                 android:id="@+id/textView3"
@@ -73,7 +81,7 @@
                 android:layout_marginTop="30dp"
                 android:text="Last session apim-request-id"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/keyText" />
+                app:layout_constraintTop_toBottomOf="@+id/keyTextLayout" />
 
             <TextView
                 android:id="@+id/resultIdtextView"
diff --git a/samples/kotlin/face/FaceAnalyzerSample/app/src/main/res/values/string_feedback.xml b/samples/kotlin/face/FaceAnalyzerSample/app/src/main/res/values/string_feedback.xml
index bdd48b9..f1bd71d 100644
--- a/samples/kotlin/face/FaceAnalyzerSample/app/src/main/res/values/string_feedback.xml
+++ b/samples/kotlin/face/FaceAnalyzerSample/app/src/main/res/values/string_feedback.xml
@@ -2,11 +2,11 @@
 <resources>
     <string name="feedback_none">Hold Still.</string>
     <string name="feedback_look_at_camera">Look at camera.</string>
-    <string name="feedback_face_not_centered">Look at camera.</string>
+    <string name="feedback_face_not_centered">Center your face in the circle.</string>
     <string name="feedback_move_closer">Too far away! Move in closer.</string>
     <string name="feedback_continue_to_move_closer">Continue to move closer.</string>
     <string name="feedback_move_back">Too close! Move farther away.</string>
     <string name="feedback_reduce_movement">Too much movement.</string>
-    <string name="feedback_smile">Ready, set, smile!</string>
+    <string name="feedback_smile">Smile for the camera!</string>
     <string name="feedback_attention_not_needed">Done, finishing up...</string>
 </resources>
\ No newline at end of file
diff --git a/samples/kotlin/face/FaceAnalyzerSample/build.gradle b/samples/kotlin/face/FaceAnalyzerSample/build.gradle
index 9d0f3f0..ed9bbd0 100644
--- a/samples/kotlin/face/FaceAnalyzerSample/build.gradle
+++ b/samples/kotlin/face/FaceAnalyzerSample/build.gradle
@@ -1,12 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.7.20"
+    ext.kotlin_version = "1.9.20"
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:7.3.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -31,4 +31,4 @@ allprojects {
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
+}
\ No newline at end of file
diff --git a/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample.xcodeproj/project.pbxproj b/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample.xcodeproj/project.pbxproj
index 4bbd16a..f938bae 100644
--- a/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample.xcodeproj/project.pbxproj
+++ b/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample.xcodeproj/project.pbxproj
@@ -30,6 +30,7 @@
 		8C020C252B173595001E72AE /* AzureAIVisionFace in Frameworks */ = {isa = PBXBuildFile; productRef = 8C020C242B173595001E72AE /* AzureAIVisionFace */; };
 		8C020C272B1735B8001E72AE /* AzureAIVisionCore in Frameworks */ = {isa = PBXBuildFile; productRef = 8C020C262B1735B8001E72AE /* AzureAIVisionCore */; };
 		8C07F2B22B699582009CFF14 /* SecureInputView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C07F2B12B699582009CFF14 /* SecureInputView.swift */; };
+		D3B3084B2C083DC4005C0C97 /* LivenessModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3B3084A2C083DC4005C0C97 /* LivenessModel.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -70,6 +71,7 @@
 		8C020C1B2B0CA45D001E72AE /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "Core/zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		8C020C1C2B16A524001E72AE /* AppUtility.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppUtility.swift; sourceTree = "<group>"; };
 		8C07F2B12B699582009CFF14 /* SecureInputView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SecureInputView.swift; sourceTree = "<group>"; };
+		D3B3084A2C083DC4005C0C97 /* LivenessModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = LivenessModel.swift; path = Core/LivenessModel.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -113,6 +115,7 @@
 				8C020B872B0C1304001E72AE /* CameraView.swift */,
 				8C020B842B0C1304001E72AE /* CameraViewController.swift */,
 				8C020B822B0C1303001E72AE /* LivenessActor.swift */,
+				D3B3084A2C083DC4005C0C97 /* LivenessModel.swift */,
 				8C020B882B0C1304001E72AE /* LivenessView.swift */,
 				8C020B832B0C1303001E72AE /* Localization.swift */,
 				8C020B862B0C1304001E72AE /* Utility.swift */,
@@ -228,6 +231,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				8C07F2B22B699582009CFF14 /* SecureInputView.swift in Sources */,
+				D3B3084B2C083DC4005C0C97 /* LivenessModel.swift in Sources */,
 				8C020B8F2B0C1304001E72AE /* Utility.swift in Sources */,
 				8C020B912B0C1304001E72AE /* LivenessView.swift in Sources */,
 				8C020C1D2B16A524001E72AE /* AppUtility.swift in Sources */,
diff --git a/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/ClientStartView.swift b/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/ClientStartView.swift
index f221f67..a6964e8 100644
--- a/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/ClientStartView.swift
+++ b/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/ClientStartView.swift
@@ -8,6 +8,7 @@ import SwiftUI
 struct ClientStartView: View {
     @EnvironmentObject var pageSelection: PageSelection
     @EnvironmentObject var sessionData: SessionData
+    @EnvironmentObject var livenessModel: LivenessModel
 
     @State private var backgroundColor: Color = Color.white
 
@@ -18,12 +19,13 @@ struct ClientStartView: View {
                 Text("Start").font(.title)
                     .padding()
             })
-            .disabled(sessionData.token == nil || sessionData.token == "")
+                .disabled(sessionData.token == nil || sessionData.token == "")
             Spacer()
         }
     }
 
     func startClient() {
+        livenessModel.reset()
         withAnimation {
             pageSelection.current = .liveness
         }
diff --git a/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/Core/CameraPreviewView.swift b/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/Core/CameraPreviewView.swift
index f92c424..7fda72f 100644
--- a/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/Core/CameraPreviewView.swift
+++ b/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/Core/CameraPreviewView.swift
@@ -7,14 +7,22 @@ import SwiftUI
 import AzureAIVisionFace
 
 struct CameraPreviewView: View {
+    @EnvironmentObject private var actor: LivenessModel
     @Binding var isCameraPreviewVisible: Bool
     let onViewDidLoad: (VisionSource) -> Void
     
     var body: some View {
             CameraRepresentable { view in
-                if let visionSourceOption = VisionSourceOptions.init(deviceOption: VisionSourceDeviceOption.defaultCaptureDevice, preview: view) {
+                if let visionSourceOption = VisionSourceOptions.init(deviceOption: VisionSourceDeviceOption.defaultCaptureDevice) {
                     DispatchQueue.main.async {
-                        onViewDidLoad(try! VisionSource.init(sourceOptions: visionSourceOption))
+                        if actor.source == nil,
+                           let source = try? VisionSource.init(sourceOptions: visionSourceOption) {
+                            actor.source = source
+                        }
+                        if let source = actor.source {
+                            source.getVisionCamera()?.setPreviewView(view)
+                            onViewDidLoad(source)
+                        }
                     }
                 }
             }
diff --git a/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/Core/CameraView.swift b/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/Core/CameraView.swift
index 8f3a39e..3c92e65 100644
--- a/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/Core/CameraView.swift
+++ b/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/Core/CameraView.swift
@@ -15,6 +15,7 @@ struct CameraView: View {
     static let previewAreaRatio = 0.12
     static let screenAspectRatio = Double(UIScreen.main.bounds.size.height / UIScreen.main.bounds.size.width)
     static let previewWidthRatio = CGFloat(2 * sqrt(previewAreaRatio * screenAspectRatio / Double.pi))
+    static let previewHeightRatio = CGFloat(2 * sqrt(previewAreaRatio / screenAspectRatio / Double.pi))
     
     let onViewDidLoad: (VisionSource) -> Void
     
@@ -25,8 +26,8 @@ struct CameraView: View {
                     Spacer()
                     VStack(alignment: .leading) {
                         CameraPreviewView(isCameraPreviewVisible: $isCameraPreviewVisible, onViewDidLoad: onViewDidLoad)
-                            .frame(width: metrics.size.width * CameraView.previewWidthRatio,
-                                   height: metrics.size.width * CameraView.previewWidthRatio,
+                            .frame(width: getLength(metrics),
+                                   height: getLength(metrics),
                                    alignment: .center)
                             .mask(Circle())
                             .padding(.top)
@@ -44,5 +45,9 @@ struct CameraView: View {
             }
         }.background(backgroundColor)
     }
+    
+    func getLength(_ metrics: GeometryProxy) -> CGFloat {
+        return metrics.size.width < metrics.size.height ? metrics.size.width * CameraView.previewWidthRatio : metrics.size.height * CameraView.previewHeightRatio
+    }
 }
 
diff --git a/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/Core/LivenessActor.swift b/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/Core/LivenessActor.swift
index 117df1e..5c3520e 100644
--- a/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/Core/LivenessActor.swift
+++ b/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/Core/LivenessActor.swift
@@ -9,69 +9,56 @@ import AzureAIVisionFace
 
 class LivenessActor
 {
-    private var faceAnalyzer: FaceAnalyzer? = nil
-    private var withVerification: Bool = false
     private var resultId: String = ""
     private var resultDigest: String = ""
 
-    let userFeedbackHandler: (String) -> Void
-    let screenBackgroundColorHandler: (Color) -> Void
-    let resultHandler: (String, String, String) -> Void
-    let detailsHandler: (FaceAnalyzedDetails?) -> Void
-    let logHandler: () -> Void
-    let stopCameraHandler: () -> Void
+    private let withVerification: Bool
+    private let faceAnalyzer: FaceAnalyzer
+    private let userFeedbackHandler: (String) -> Void
+    private let screenBackgroundColorHandler: (Color) -> Void
+    private let resultHandler: (String, String, String) -> Void
+    private let detailsHandler: (FaceAnalyzedDetails?) -> Void
+    private let logHandler: () -> Void
+    private let stopCameraHandler: () -> Void
 
     func stopAnalyzer() {
-        if let analyzer = self.faceAnalyzer
-        {
-            try! analyzer.stopAnalyzeOnce()
-            self.faceAnalyzer = nil
-        }
+        try! self.faceAnalyzer.stopAnalyzeOnce()
     }
 
-    init(userFeedbackHandler: @escaping (String) -> Void,
+    init(faceAnalyzer: FaceAnalyzer,
+         withVerification: Bool,
+         userFeedbackHandler: @escaping (String) -> Void,
          resultHandler: @escaping (String, String, String) -> Void,
          screenBackgroundColorHandler: @escaping (Color) -> Void,
          detailsHandler: @escaping (FaceAnalyzedDetails?) -> Void,
          logHandler: @escaping () -> Void,
-         stopCameraHandler: @escaping () -> Void,
-         withVerification: Bool) {
+         stopCameraHandler: @escaping () -> Void) {
+        self.faceAnalyzer = faceAnalyzer
+        self.withVerification = withVerification
         self.resultHandler = resultHandler
         self.userFeedbackHandler = userFeedbackHandler
         self.screenBackgroundColorHandler = screenBackgroundColorHandler
         self.detailsHandler = detailsHandler
         self.logHandler = logHandler
-        self.withVerification = withVerification
         self.stopCameraHandler = stopCameraHandler
     }
+    
+    static func createFaceAnalyzer(source: VisionSource,
+                                   sessionAuthorizationToken: String) async throws -> FaceAnalyzer? {
+        guard let createOptions = try? FaceAnalyzerCreateOptions() else {
+            return nil
+        }
 
-    func start(usingSource visionSource: VisionSource,
-               sessionAuthorizationToken: String) async
-    {
-        let methodOptions: FaceAnalysisOptions
-        do {
-            let createOptions = try FaceAnalyzerCreateOptions()
-            methodOptions = try FaceAnalysisOptions()
-
-            let serviceOptions = try VisionServiceOptions()
-            serviceOptions.authorizationToken = sessionAuthorizationToken
+        var serviceOptions = try VisionServiceOptions()
+        serviceOptions.authorizationToken = sessionAuthorizationToken
 
-            createOptions.faceAnalyzerMode = FaceAnalyzerMode.trackFacesAcrossImageStream
-            methodOptions.faceSelectionMode = FaceSelectionMode.largest
-            faceAnalyzer = try await FaceAnalyzer.create(serviceOptions: serviceOptions, input: visionSource, createOptions: createOptions)
-        }
-        catch {
-            self.resultHandler("Error configuring service", self.resultId, self.resultDigest)
-            return
-        }
+        createOptions.faceAnalyzerMode = FaceAnalyzerMode.trackFacesAcrossImageStream
+        return try await FaceAnalyzer.create(serviceOptions: serviceOptions, input: source, createOptions: createOptions)
+    }
 
-        guard faceAnalyzer != nil else {
-            self.resultHandler("Error creating FaceAnalyzer", self.resultId, self.resultDigest)
-            return
-        }
+    func start() async {
 
-        let visionCamera = visionSource.getVisionCamera()
-        faceAnalyzer?.addAnalyzedEventHandler {[] (analyzer: FaceAnalyzer, result: FaceAnalyzedResult) in
+        self.faceAnalyzer.addAnalyzedEventHandler {[] (analyzer: FaceAnalyzer, result: FaceAnalyzedResult) in
             print("session analyzed event callback")
 
             // this result is used for sample App demo purpose only, you should handle the liveness results in your own way
@@ -142,7 +129,7 @@ class LivenessActor
             print(livenessResultString)
         }
 
-        faceAnalyzer?.addAnalyzingEventHandler { (analyzer: FaceAnalyzer, result: FaceAnalyzingResult) in
+        self.faceAnalyzer.addAnalyzingEventHandler { (analyzer: FaceAnalyzer, result: FaceAnalyzingResult) in
             var userNotification = ""
             let count = result.faces.count
             guard  count != 0  else {
@@ -174,16 +161,25 @@ class LivenessActor
             self.userFeedbackHandler(String(userNotification))
         }
 
-        faceAnalyzer?.addSessionStartedEventHandler { analyzer, evt in
+        self.faceAnalyzer.addSessionStartedEventHandler { analyzer, evt in
             print("session started event callback")
         }
 
-        faceAnalyzer?.addSessionStoppedEventHandler {[weak self] FaceAnalyzer, session, evt in
+        self.faceAnalyzer.addSessionStoppedEventHandler {[weak self] FaceAnalyzer, session, evt in
             print("session stopped event callback")
             self!.userFeedbackHandler("Done, finishing up...")
         }
 
-        faceAnalyzer?.analyzeOnce(using: methodOptions,completionHandler: { (result, error) in
+        let methodOptions: FaceAnalysisOptions
+        do {
+            methodOptions = try FaceAnalysisOptions()
+            methodOptions.faceSelectionMode = FaceSelectionMode.largest
+        } catch {
+            self.resultHandler("Error configuring analysis", self.resultId, self.resultDigest)
+            return
+        }
+
+        self.faceAnalyzer.analyzeOnce(using: methodOptions, completionHandler: { (result, error) in
             print("analyzeOnce completion handler")
         })
 
diff --git a/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/Core/LivenessModel.swift b/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/Core/LivenessModel.swift
new file mode 100644
index 0000000..cc4a131
--- /dev/null
+++ b/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/Core/LivenessModel.swift
@@ -0,0 +1,17 @@
+//
+// Copyright (c) Microsoft. All rights reserved.
+//
+
+import Foundation
+import AzureAIVisionCore
+import AzureAIVisionFace
+
+class LivenessModel: ObservableObject {
+    @Published var source: VisionSource? = nil
+    @Published var analyzer: FaceAnalyzer? = nil
+    
+    func reset() {
+        source = nil
+        analyzer = nil
+    }
+}
diff --git a/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/Core/LivenessView.swift b/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/Core/LivenessView.swift
index 6ccf32e..7a7bab4 100644
--- a/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/Core/LivenessView.swift
+++ b/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/Core/LivenessView.swift
@@ -9,6 +9,7 @@ import AzureAIVisionFace
 
 struct LivenessView: View {
 
+    @EnvironmentObject var livenessModel: LivenessModel
     @State private var actor: LivenessActor? = nil
     // localization can be applied to feedbackMessage
     @State private var feedbackMessage: String = "Hold still."
@@ -30,8 +31,8 @@ struct LivenessView: View {
 
     init(sessionAuthorizationToken: String,
          withVerification: Bool = false,
-         completionHandler: @escaping (String, String, String)->Void = {_,_,_ in },
-         detailsHandler: @escaping (FaceAnalyzedDetails?)->Void = {_ in }) {
+         completionHandler: @escaping (String, String, String) -> Void = { _, _, _ in },
+         detailsHandler: @escaping (FaceAnalyzedDetails?) -> Void = { _ in }) {
         self.sessionAuthorizationToken = sessionAuthorizationToken
         self.withVerification = withVerification
         self.completionHandler = completionHandler
@@ -44,36 +45,53 @@ struct LivenessView: View {
                 backgroundColor: $backgroundColor,
                 feedbackMessage: $feedbackMessage,
                 isCameraPreviewVisible: $isCameraPreviewVisible) { visionSource in
-                    let actor = self.actor ?? LivenessActor.init(
-                        userFeedbackHandler: { feedback in
-                            self.feedbackMessage = feedback
-                        },
-                        resultHandler: {result, resultId, resultDigest in
-                            // This is just for demo purpose
-                            // You should handle the liveness result in your own way
-                            self.feedbackMessage = result
-                            self.resultMessage = result
-                            self.resultId = resultId
-                            self.resultDigest = resultDigest
-                            self.actionDidComplete()
-                        },
-                        screenBackgroundColorHandler: { color in
-                            self.backgroundColor = color
-                        },
-                        detailsHandler: { faceAnalyzedDetails in
-                            // Not necessary, but you can get the digest details here
-                            self.detailsHandler(faceAnalyzedDetails)
-                        },
-                        logHandler: {
-                            self.logHandler()
-                        },
-                        stopCameraHandler: {
-                            self.isCameraPreviewVisible = false
-                        },
-                        withVerification: self.withVerification)
-                    self.actor = actor
                     Task {
-                        await actor.start(usingSource: visionSource, sessionAuthorizationToken: self.sessionAuthorizationToken)
+                        if self.livenessModel.analyzer == nil {
+                            do {
+                                guard let analyzer = try await LivenessActor.createFaceAnalyzer(source: visionSource, sessionAuthorizationToken: self.sessionAuthorizationToken) else {
+                                    self.feedbackMessage = ""
+                                    self.resultMessage = "Error creating FaceAnalyzer"
+                                    self.actionDidComplete()
+                                    return
+                                }
+                                self.livenessModel.analyzer = analyzer
+                            } catch {
+                                self.feedbackMessage = ""
+                                self.resultMessage = "Error configuring service"
+                                self.actionDidComplete()
+                                return
+                            }
+                        }
+                        self.actor = self.actor ?? LivenessActor.init(
+                            faceAnalyzer: self.livenessModel.analyzer!,
+                            withVerification: self.withVerification,
+                            userFeedbackHandler: { feedback in
+                                self.feedbackMessage = feedback
+                            },
+                            resultHandler: { result, resultId, resultDigest in
+                                // This is just for demo purpose
+                                // You should handle the liveness result in your own way
+                                self.feedbackMessage = result
+                                self.resultMessage = result
+                                self.resultId = resultId
+                                self.resultDigest = resultDigest
+                                self.actionDidComplete()
+                            },
+                            screenBackgroundColorHandler: { color in
+                                self.backgroundColor = color
+                            },
+                            detailsHandler: { faceAnalyzedDetails in
+                                // Not necessary, but you can get the digest details here
+                                self.detailsHandler(faceAnalyzedDetails)
+                            },
+                            logHandler: {
+                                self.logHandler()
+                            },
+                            stopCameraHandler: {
+                                self.isCameraPreviewVisible = false
+                            })
+                        self.isCameraPreviewVisible = true
+                        await self.actor?.start()
                     }
                 }
         }
diff --git a/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/Core/Localization.swift b/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/Core/Localization.swift
index 30c633c..2375bcc 100644
--- a/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/Core/Localization.swift
+++ b/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/Core/Localization.swift
@@ -23,6 +23,8 @@ struct LocalizationStrings {
     static let recognitionFailureImageSizeIsTooLarge = NSLocalizedString("ImageSizeIsTooLarge", comment: "")
     static let recognitionFailureImageSizeIsTooSmall = NSLocalizedString("ImageSizeIsTooSmall", comment: "")
     static let recognitionFailureGenericFailure = NSLocalizedString("GenericFailure", comment: "")
+    static let recognitionFailureFaceMouthRegionNotVisible = NSLocalizedString("FaceMouthRegionNotVisible", comment: "")
+    static let recognitionFailureFaceWithMaskDetected = NSLocalizedString("FaceWithMaskDetected", comment: "")
 
     static let livenessStatusNotComputed = NSLocalizedString("NotComputed", comment: "")
     static let livenessStatusFailed = NSLocalizedString("Failed", comment: "")
@@ -45,7 +47,7 @@ struct LocalizationStrings {
     static let livenessFailureUnexpected = NSLocalizedString("Unexpected", comment: "")
     static let livenessFailureUnknown = NSLocalizedString("Unknown", comment: "")
 
-    static let faceFeedbackFaceNotCentered = NSLocalizedString("Look at camera.", comment: "")
+    static let faceFeedbackFaceNotCentered = NSLocalizedString("Center your face in the circle.", comment: "")
     static let faceFeedbackLookAtCamera = NSLocalizedString("Look at camera.", comment: "")
     static let faceFeedbackMoveBack = NSLocalizedString("Too close! Move farther away.", comment: "")
     static let faceFeedbackMoveCloser = NSLocalizedString("Too far away! Move in closer.", comment: "")
diff --git a/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/Core/Utility.swift b/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/Core/Utility.swift
index b9e2463..104548d 100644
--- a/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/Core/Utility.swift
+++ b/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/Core/Utility.swift
@@ -84,7 +84,6 @@ func getSourceFromImage(image: UIImage) ->VisionFrameSource {
     let width = image.size.width
     let height = image.size.height
     let stride = image.cgImage?.bytesPerRow
-    let bitmatpinfo = image.cgImage?.bitmapInfo
     let fourcc = image.cgImage?.bitmapInfo.pixelFormat?.getFourCCString()
     let format = try! VisionFrameFormat(fourCCFormat: fourcc!, width: Int(width), height: Int(height), stride: Int(stride!))
     let source = try! VisionFrameSource(format: format)
@@ -136,6 +135,8 @@ func RecognitionFailureToString(reason: FaceRecognitionFailureReason) -> String
         case .contentDecodingError: return LocalizationStrings.recognitionFailureContentDecodingError
         case .imageSizeIsTooLarge: return LocalizationStrings.recognitionFailureImageSizeIsTooLarge
         case .imageSizeIsTooSmall: return LocalizationStrings.recognitionFailureImageSizeIsTooSmall
+        case .faceMouthRegionNotVisible: return LocalizationStrings.recognitionFailureFaceMouthRegionNotVisible
+        case .faceWithMaskDetected: return LocalizationStrings.recognitionFailureFaceWithMaskDetected
         default: return LocalizationStrings.recognitionFailureGenericFailure
     }
 }
diff --git a/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/Core/en.lproj/Localizable.strings b/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/Core/en.lproj/Localizable.strings
index 7f60c59..68d0f4a 100644
--- a/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/Core/en.lproj/Localizable.strings
+++ b/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/Core/en.lproj/Localizable.strings
@@ -37,6 +37,7 @@
 "Unexpected" = "Unexpected error";
 
 "Look at camera." = "Look at camera.";
+"Center your face in the circle." = "Center your face in the circle.";
 "Too close! Move farther away." = "Too close! Move farther away.";
 "Too far away! Move in closer." = "Too far away! Move in closer.";
 "Continue to move closer." = "Continue to move closer.";
diff --git a/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/Core/zh-Hans.lproj/Localizable.strings b/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/Core/zh-Hans.lproj/Localizable.strings
index 0eb1880..62e88c1 100644
--- a/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/Core/zh-Hans.lproj/Localizable.strings
+++ b/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/Core/zh-Hans.lproj/Localizable.strings
@@ -35,6 +35,7 @@
 "Unexpected" = "未知错误";
 
 "Look at camera." = "看向摄像头";
+"Center your face in the circle." = "请将您的脸移动到圆圈中心";
 "Too close! Move farther away." = "太近了！请远离一些。";
 "Too far away! Move in closer." = "太远了！请靠近一些。";
 "Continue to move closer." = "请再靠近一些。";
diff --git a/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/MainView.swift b/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/MainView.swift
index ab53d00..0aafcd1 100644
--- a/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/MainView.swift
+++ b/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/MainView.swift
@@ -46,7 +46,8 @@ class SessionData: ObservableObject {
 struct MainView: View {
     @EnvironmentObject var pageSelection: PageSelection
     @EnvironmentObject var sessionData: SessionData
-    
+    @StateObject var livenessModel = LivenessModel()
+
     var body: some View {
         ZStack {
             switch pageSelection.current {
@@ -69,12 +70,14 @@ struct MainView: View {
                                     }
                                 }
                             })
+                    .environmentObject(livenessModel)
 
             case .result:
                 ResultView()
 
             case .clientStart:
                 ClientStartView()
+                    .environmentObject(livenessModel)
 
             case .imageSelection:
                 ImageSelectionView()
@@ -94,6 +97,6 @@ struct MainView: View {
                 }.padding()
             }
         }
-        
+
     }
 }
diff --git a/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/ResultView.swift b/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/ResultView.swift
index 84af141..a2b8a71 100644
--- a/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/ResultView.swift
+++ b/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/ResultView.swift
@@ -26,14 +26,28 @@ struct ResultView: View {
                     .foregroundColor(Color.black)
                     .padding(.top, -2.5)
                 Spacer()
-                Button(action: doneReviewInDemo, label: {
-                    Text("Continue")
-                        .padding()
-                })
+                HStack() {
+                    Button(action: retry, label: {
+                        Text("Retry")
+                            .foregroundColor(.red)
+                            .padding()
+                    })
+                    Spacer()
+                    Button(action: doneReviewInDemo, label: {
+                        Text("Continue")
+                            .padding()
+                    })
+                }
             }
 
         }
     }
+    
+    func retry() {
+        withAnimation {
+            pageSelection.current = .liveness
+        }
+    }
 
     func doneReviewInDemo() {
         withAnimation {
diff --git a/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/SecureInputView.swift b/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/SecureInputView.swift
index 12234f2..409ad2b 100644
--- a/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/SecureInputView.swift
+++ b/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/SecureInputView.swift
@@ -18,6 +18,7 @@ struct SecureInputView: View {
                     SecureField(title, text: $text)
                 } else {
                     TextField(title, text: $text)
+                        .autocorrectionDisabled()
                 }
             }.padding(.trailing, 48)
 
diff --git a/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/SettingsView.swift b/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/SettingsView.swift
index 4099d37..a4467a2 100644
--- a/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/SettingsView.swift
+++ b/samples/swift/face/FaceAnalyzerSample/FaceAnalyzerSample/SettingsView.swift
@@ -12,6 +12,7 @@ struct SettingsView: View {
     var body: some View {
         VStack {
             TextField("Face API endpoint", text: $sessionData.endpoint)
+                .autocorrectionDisabled()
                 .font(Font.custom("Helvetica Neue", size: 15.0))
                 .textFieldStyle(RoundedBorderTextFieldStyle.init())
                 .padding()
@@ -26,16 +27,16 @@ struct SettingsView: View {
                     .disabled(true)
                     .padding()
             }
-            .contentShape(Rectangle())
-            .onTapGesture {
-                if ($sessionData.resultId.wrappedValue != "") {
-                    UIPasteboard.general.string = $sessionData.resultId.wrappedValue
-                    showCopyAlert = true
+                .contentShape(Rectangle())
+                .onTapGesture {
+                    if ($sessionData.resultId.wrappedValue != "") {
+                        UIPasteboard.general.string = $sessionData.resultId.wrappedValue
+                        showCopyAlert = true
+                    }
+                }
+                .alert(isPresented: $showCopyAlert) {
+                    Alert(title: Text("Result ID Copied"), message: Text("Result ID has been copied"))
                 }
-            }
-            .alert(isPresented: $showCopyAlert) {
-                Alert(title: Text("Result ID Copied"), message: Text("Result ID has been copied"))
-            }
 
             Toggle("Send results to client", isOn: $sessionData.sendResultsToClient)
                 .padding(.horizontal)
diff --git a/samples/swift/face/FaceAnalyzerSample/README.md b/samples/swift/face/FaceAnalyzerSample/README.md
index d966c53..e205559 100644
--- a/samples/swift/face/FaceAnalyzerSample/README.md
+++ b/samples/swift/face/FaceAnalyzerSample/README.md
@@ -9,8 +9,8 @@ In this sample, you will learn how to build and run the face liveness detection
 ## Prerequisites
 
 1. An Azure Face API resource subscription.
-1. A Mac (with iOS development environment including Xcode 13+ and [Git LFS](https://git-lfs.github.com/)) and an iPhone (with iOS version 14 or above) to test the AzureAIVision SDK.
-1. An Apple developer account to install and run development apps on the iPhone.
+2. A Mac (with iOS development environment including Xcode 13+) and an iPhone (with iOS version 14 or above) to test the AzureAIVision SDK.
+3. An Apple developer account to install and run development apps on the iPhone.
 
 ## Set up the environment 
 1. If this is your first time using your Mac to develop, you should build a sample app from [About Me &#x2014; Sample Apps Tutorials | Apple Developer Documentation](https://developer.apple.com/tutorials/sample-apps/aboutme) and run it on your phone before you attempt to build the App here. This will help ensure that your developer environment has been setup properly.
@@ -60,21 +60,7 @@ In this sample, you will learn how to build and run the face liveness detection
          sudo ln -s $(which git-lfs) $(xcode-select -p)/usr/bin/git-lfs
          ```
 
-      - If the previous step failed with `ln: git-lfs: Operation not permitted`, your macOS version has [System Integrity Protection (SIP)](https://developer.apple.com/documentation/security/disabling_and_enabling_system_integrity_protection) enabled and configured to protect the Git executable shipped with Xcode toolchain. There are several options to resolve:
-         - Use your security judgment or consult with your enterprise administrators, then temporarily disable SIP before reattempting to run the code above if this is acceptable for you, following instructions in the official article [Disabling and Enabling System Integrity Protection | Apple Developer Documentation](https://developer.apple.com/documentation/security/disabling_and_enabling_system_integrity_protection).
-         - Switch to using your system Git.
-            - When you encounter error that says "Package Resolution Failed", dismiss with "Add Anyway". This will add a partially configured package dependency.
-            - If Xcode Command Line Tools is never installed on your machine, install it first [following instructions from Apple Developer website](https://developer.apple.com/library/archive/technotes/tn2339/_index.html).
-            - Run the following command from Terminal, from the directory where your .xcodeproj is located, as appropriate for your project. It will resolve the package through your system Git. Your system Git should already have Git LFS configured, as mentioned in Prerequisites section.
-
-              ```
-              xcodebuild -scmProvider system -resolvePackageDependencies
-              ```
-       
-              > **Note**: You can also add `-project`, `-workspace`, and `-scheme` arguments as appropriate to target your development setup. Refer to the [xcodebuild (Command Line Tools) FAQ](https://developer.apple.com/library/archive/technotes/tn2339/_index.html) and `-help` section.
-
-            - If the command above ran successfully, your project should be able to successfully resolve the dependency from Xcode as well.
-         - Alternatively, you may prefer to use CocoaPods instead. This issue has been [reported to Apple](https://github.com/apple/swift-package-manager/issues/5351) and we are awaiting resolution.
+      - If the previous step failed with `ln: git-lfs: Operation not permitted`, your macOS version has [System Integrity Protection (SIP)](https://developer.apple.com/documentation/security/disabling_and_enabling_system_integrity_protection) enabled and configured to protect the Git executable shipped with Xcode toolchain. Use your security judgment or consult with your enterprise administrators, then temporarily disable SIP before reattempting to run the code above if this is acceptable for you, following instructions in the official article [Disabling and Enabling System Integrity Protection | Apple Developer Documentation](https://developer.apple.com/documentation/security/disabling_and_enabling_system_integrity_protection). Alternatively, you may prefer to use CocoaPods instead. This issue has been [reported to Apple](https://github.com/apple/swift-package-manager/issues/5351) and we are awaiting resolution.
 
 1. [Refer to the API reference documentation](#api-reference-documentation) to learn more about our SDK APIs.
 
@@ -87,7 +73,7 @@ Now that you have setup your environment you can either:
 ## Build and run sample App
 
 1. Download the sample App folder. Double click the .xcodeproj file. This will open the project in Xcode.
-1. Add package dependency through CocoaPods or Swift Package Manager, as mentioned before. You should add both AzureAIVisionFace.xcframework and AzureAIVisionCore.xcframework into the project.
+1. Add package dependency through Swift Package Manager, as mentioned before. You should add both AzureAIVisionFace.xcframework and AzureAIVisionCore.xcframework into the project.
 1. Set the App bundle identifier and developer team in XCode per your needs.
 1. Now attach your phone to the Mac. You should get prompt on the phone asking you to "Trust" the Mac. Enable the trust.
 1. The phone should now show up in the Xcode top bar. Your iPhone name should be visible.
@@ -197,8 +183,8 @@ Here are the recommended steps you should consider to follow during your integra
    ```swift
    // this is for demo purpose only, session-authorization-token can be obtained in the App server directly
    let sessionAuthorizationToken = obtainToken(...)
-   serviceOptions = try VisionServiceOptions()
-   serviceOptions.authorizationToken = sessionAuthorizationToken
+   serviceOptions = try  VisionServiceOptions(endpoint: "")
+   serviceOptions?.authorizationToken = sessionAuthorizationToken
    ```
 
    Note: