diff --git a/app/build.gradle b/app/build.gradle
index 5fedc5e9..24cda459 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -129,6 +129,7 @@ dependencies {
     implementation("org.greenrobot:eventbus")
     implementation project(':hyperswitch-sdk-android-lite')
     implementation('com.squareup.okhttp3:okhttp')
+    compileOnly project(':react-native-hyperswitch-unified-3ds')
 
     constraints {
         implementation("com.squareup.okhttp3:okhttp") {
@@ -136,7 +137,7 @@ dependencies {
                 prefer '3.3.0'
             }
         }
-        
+
         implementation("androidx.appcompat:appcompat") {
             version {
                 prefer '1.6.1'
diff --git a/app/src/main/java/io/hyperswitch/authentication/AuthenticationSession.kt b/app/src/main/java/io/hyperswitch/authentication/AuthenticationSession.kt
new file mode 100644
index 00000000..3dc74111
--- /dev/null
+++ b/app/src/main/java/io/hyperswitch/authentication/AuthenticationSession.kt
@@ -0,0 +1,62 @@
+package io.hyperswitch.authentication
+
+import android.app.Activity
+import io.hyperswitch.modular_3ds.api.ThreeDSAuthenticationSession
+
+
+class AuthenticationSession(
+    private val activity: Activity,
+    private val publishKey: String
+) {
+    companion object {
+        /**
+         * Check if the 3DS library is available at runtime
+         * 
+         * @return true if modular_3ds library is available, false otherwise
+         */
+        @JvmStatic
+        fun isAvailable(): Boolean {
+            return try {
+                Class.forName("io.hyperswitch.modular_3ds.api.ThreeDSAuthenticationSession")
+                true
+            } catch (e: ClassNotFoundException) {
+                false
+            }
+        }
+    }
+    
+    private val internalAuthSession: ThreeDSAuthenticationSession
+    
+    init {
+        if (!isAvailable()) {
+            throw IllegalStateException(
+                "3DS library not found. Please add the following dependency to your build.gradle:\n" +
+                "implementation 'io.hyperswitch:modular-3ds-api:x.x.x'\n" +
+                "You can check availability using AuthenticationSession.isAvailable() before instantiation."
+            )
+        }
+        internalAuthSession = ThreeDSAuthenticationSession(activity, publishKey)
+    }
+
+    /**
+     * Initialize a 3DS session
+     * 
+     * @param authIntentClientSecret The authentication intent client secret
+     * @param configuration Authentication configuration (use AuthenticationConfiguration from this package)
+     * @param callback Callback to receive authentication result (use AuthenticationResult from this package)
+     * @return Session object if initialization is successful, null otherwise
+     */
+    fun initThreeDsSession(
+        authIntentClientSecret: String,
+        configuration: AuthenticationConfiguration,
+        callback: (AuthenticationResult) -> Unit
+    ): Session? {
+        return internalAuthSession.initThreeDsSession(
+            authIntentClientSecret = authIntentClientSecret,
+            configuration = configuration
+        ) { modularResult ->
+            // Convert modular_3ds result to wrapper result
+            callback(AuthenticationResult.from(modularResult))
+        }
+    }
+}
diff --git a/app/src/main/java/io/hyperswitch/authentication/TypeAliases.kt b/app/src/main/java/io/hyperswitch/authentication/TypeAliases.kt
new file mode 100644
index 00000000..df03c3dd
--- /dev/null
+++ b/app/src/main/java/io/hyperswitch/authentication/TypeAliases.kt
@@ -0,0 +1,58 @@
+package io.hyperswitch.authentication
+
+/**
+ * Type aliases and wrappers for 3DS authentication types
+ * 
+ * These allow merchants to use io.hyperswitch.authentication.* namespace
+ * while the actual implementation comes from io.hyperswitch.modular_3ds
+ */
+
+// Session and Transaction types
+typealias Session = io.hyperswitch.modular_3ds.api.ThreeDSSession
+typealias Transaction = io.hyperswitch.modular_3ds.api.ThreeDSTransaction
+
+// Configuration and Parameters
+typealias AuthenticationConfiguration = io.hyperswitch.modular_3ds.api.AuthenticationConfiguration
+typealias AuthenticationRequestParameters = io.hyperswitch.modular_3ds.api.AuthenticationRequestParameters
+typealias ChallengeParameters = io.hyperswitch.modular_3ds.models.ChallengeParameters
+
+// Callbacks
+typealias ChallengeStatusReceiver = io.hyperswitch.modular_3ds.api.ChallengeStatusReceiver
+
+// Events
+typealias CompletionEvent = io.hyperswitch.modular_3ds.api.CompletionEvent
+typealias ProtocolErrorEvent = io.hyperswitch.modular_3ds.api.ProtocolErrorEvent
+typealias RuntimeErrorEvent = io.hyperswitch.modular_3ds.api.RuntimeErrorEvent
+typealias ErrorMessage = io.hyperswitch.modular_3ds.api.ErrorMessage
+
+// Environment and Customization
+typealias ThreeDSEnvironment = io.hyperswitch.modular_3ds.models.ThreeDSEnvironment
+typealias UiCustomization = io.hyperswitch.modular_3ds.models.UiCustomization
+typealias ToolbarCustomization = io.hyperswitch.modular_3ds.models.ToolbarCustomization
+
+// Provider Registration
+typealias ProviderRegistry = io.hyperswitch.modular_3ds.provider.ProviderRegistry
+typealias ProviderFactory = io.hyperswitch.modular_3ds.provider.ProviderFactory
+
+/**
+ * Wrapper for AuthenticationResult sealed class
+ * This is needed because type aliases don't work well with sealed classes and their nested types
+ */
+sealed class AuthenticationResult {
+    object Success : AuthenticationResult()
+    data class Error(val message: String) : AuthenticationResult()
+    object Challenge : AuthenticationResult()
+    
+    companion object {
+        /**
+         * Convert from modular_3ds AuthenticationResult to wrapper AuthenticationResult
+         */
+        internal fun from(result: io.hyperswitch.modular_3ds.api.AuthenticationResult): AuthenticationResult {
+            return when (result) {
+                is io.hyperswitch.modular_3ds.api.AuthenticationResult.Success -> Success
+                is io.hyperswitch.modular_3ds.api.AuthenticationResult.Error -> Error(result.message)
+                is io.hyperswitch.modular_3ds.api.AuthenticationResult.Challenge -> Challenge
+            }
+        }
+    }
+}
diff --git a/demo-app/build.gradle b/demo-app/build.gradle
index bf3b9578..382793ee 100644
--- a/demo-app/build.gradle
+++ b/demo-app/build.gradle
@@ -84,12 +84,13 @@ dependencies {
     implementation 'com.github.kittinunf.fuel:fuel-json:2.3.1'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
-    implementation project(':app')
+   implementation project(':app')
     implementation ('com.wix:detox:+')
     androidTestImplementation('com.wix:detox:+')
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation project(':hyperswitch-sdk-android-lite')
-    implementation(project(":hyperswitch-scan-card-lite"))
+    implementation project(':react-native-hyperswitch-unified-3ds')
+    implementation ('io.hyperswitch:modular-3ds-trident:1.0.0')
     compileOnly 'com.facebook.react:react-android'
     implementation 'org.slf4j:slf4j-nop:2.0.9'
 }
\ No newline at end of file
diff --git a/demo-app/src/main/AndroidManifest.xml b/demo-app/src/main/AndroidManifest.xml
index f500f4d4..4bb1e07a 100644
--- a/demo-app/src/main/AndroidManifest.xml
+++ b/demo-app/src/main/AndroidManifest.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <!-- Network permissions for API calls -->
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
     <application
         android:allowBackup="true"
         android:extractNativeLibs="true"
@@ -24,7 +28,11 @@
         <activity android:name=".WidgetActivity"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar"
             >
-    </activity>
+        </activity>
+        <activity android:name=".ThreeDSTestActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"
+            >
+        </activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/demo-app/src/main/java/io/hyperswitch/demoapp/MainActivity.kt b/demo-app/src/main/java/io/hyperswitch/demoapp/MainActivity.kt
index 620f58f4..4425acf9 100644
--- a/demo-app/src/main/java/io/hyperswitch/demoapp/MainActivity.kt
+++ b/demo-app/src/main/java/io/hyperswitch/demoapp/MainActivity.kt
@@ -312,6 +312,12 @@ class MainActivity : Activity() {
             startActivity(intent)
         }
 
+        findViewById<View>(R.id.launchAuthenticationButton).setOnClickListener{
+            val intent = Intent(this, ThreeDSTestActivity::class.java)
+            intent.putExtra("publishKey", publishKey)
+            intent.putExtra("clientSecret", paymentIntentClientSecret)
+            startActivity(intent)
+        }
     }
 
     private fun setStatus(error: String) {
diff --git a/demo-app/src/main/java/io/hyperswitch/demoapp/ThreeDSTestActivity.kt b/demo-app/src/main/java/io/hyperswitch/demoapp/ThreeDSTestActivity.kt
new file mode 100644
index 00000000..19ad1636
--- /dev/null
+++ b/demo-app/src/main/java/io/hyperswitch/demoapp/ThreeDSTestActivity.kt
@@ -0,0 +1,496 @@
+package io.hyperswitch.demoapp
+
+import android.app.Activity
+import android.os.Bundle
+import android.util.Log
+import android.widget.Button
+import android.widget.TextView
+import io.hyperswitch.authentication.*
+import io.hyperswitch.modular_3ds.trident.TridentProviderFactory
+import okhttp3.*
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.RequestBody.Companion.toRequestBody
+import org.json.JSONObject
+import java.io.IOException
+
+class ThreeDSTestActivity : Activity() {
+
+    private lateinit var statusText: TextView
+    private var publishKey: String = ""
+    private var paymentIntentClientSecret: String = ""
+    // New merchant-facing API objects
+    private lateinit var authenticationSession: AuthenticationSession
+    private var session: Session? = null
+    private var transaction: Transaction? = null
+    private var aReqParams: AuthenticationRequestParameters? = null
+    private var challengeParameters: ChallengeParameters? = null
+    // API credentials and data
+    private val apiKey = ""
+    private val profileId = ""
+    private val baseUrl = "https://sandbox.hyperswitch.io"
+    private var authenticationId: String? = null
+    // Eligibility response data
+    private var threeDsServerTransactionId: String? = null
+    private var messageVersion: String? = null
+    private var directoryServerId: String? = null
+    // HTTP client - use singleton to avoid creating multiple instances
+    private val httpClient by lazy {
+        OkHttpClient.Builder()
+            .connectTimeout(15, java.util.concurrent.TimeUnit.SECONDS)
+            .readTimeout(15, java.util.concurrent.TimeUnit.SECONDS)
+            .writeTimeout(15, java.util.concurrent.TimeUnit.SECONDS)
+            .build()
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.three_ds_test_activity)
+
+        // Get data from intent
+        publishKey = intent.getStringExtra("publishKey") ?: ""
+        paymentIntentClientSecret = intent.getStringExtra("clientSecret") ?: ""
+
+        statusText = findViewById(R.id.statusText)
+
+        // Register Trident 3DS provider
+        ProviderRegistry.registerProvider(TridentProviderFactory())
+
+        // Initialize AuthenticationSession
+        authenticationSession = AuthenticationSession(this, publishKey)
+
+        setupButtons()
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        // Clean up resources to prevent memory leaks
+        session = null
+        transaction = null
+        aReqParams = null
+        challengeParameters = null
+
+        // Cancel any pending HTTP calls
+        try {
+            httpClient.dispatcher.executorService.shutdown()
+        } catch (e: Exception) {
+            Log.w("ThreeDSTest", "Error shutting down HTTP client: ${e.message}")
+        }
+    }
+
+    private fun setupButtons() {
+        findViewById<Button>(R.id.btnInit3DS).setOnClickListener {
+            setStatus("Step 1: Initializing Authentication Session...")
+            initializeAndCreateAuthentication()
+        }
+
+        findViewById<Button>(R.id.btnGenerateAReq).setOnClickListener {
+            setStatus("Step 2: Creating Transaction and Generating AReq...")
+            createTransactionAndGenerateAReq()
+        }
+
+        findViewById<Button>(R.id.btnReceiveChallenge).setOnClickListener {
+            setStatus("Step 3: Making Authentication API Call...")
+            makeAuthenticationApiCall()
+        }
+
+        findViewById<Button>(R.id.btnDoChallenge).setOnClickListener {
+            setStatus("Step 4: Performing Challenge...")
+            performChallenge()
+        }
+
+        findViewById<Button>(R.id.btnBack).setOnClickListener {
+            finish()
+        }
+    }
+
+    private fun initializeAndCreateAuthentication() {
+        try {
+            if (paymentIntentClientSecret.isEmpty()) {
+                setStatus("Error: Payment Intent Client Secret is required")
+                return
+            }
+
+            setStatus("🔧 Initializing 3DS SDK...")
+
+            // Create authentication configuration
+            val authenticationConfiguration = AuthenticationConfiguration(
+                apiKey = "test_api_key_123",
+                environment = ThreeDSEnvironment.SANDBOX,
+                uiCustomization = null  // UI customization can be added later if needed
+            )
+
+            session = authenticationSession.initThreeDsSession(
+                authIntentClientSecret = paymentIntentClientSecret,
+                configuration = authenticationConfiguration
+            ) { result ->
+                when (result) {
+                    is AuthenticationResult.Success -> {
+                        setStatus("✅ 3DS SDK initialized. Making API call to create authentication...")
+                        createAuthenticationApiCall()
+                    }
+                    is AuthenticationResult.Error -> {
+                        setStatus("❌ Error: ${result.message}")
+                    }
+                    is AuthenticationResult.Challenge -> {
+                        setStatus("🔄 Challenge required")
+                    }
+                }
+            }
+
+        } catch (e: Exception) {
+            setStatus("❌ Error initializing session: ${e.message}")
+            Log.e("ThreeDSTest", "Error in initializeAndCreateAuthentication", e)
+        }
+    }
+
+    private fun createAuthenticationApiCall() {
+        val requestBody = JSONObject().apply {
+            put("amount", 1050)
+            put("currency", "EUR")
+            put("acquirer_details", JSONObject().apply {
+                put("acquirer_merchant_id", "12134")
+                put("acquirer_bin", "438309")
+                put("merchant_country_code", "004")
+            })
+            put("authentication_connector", "juspaythreedsserver")
+        }
+
+        val request = Request.Builder()
+            .url("$baseUrl/authentication")
+            .post(requestBody.toString().toRequestBody("application/json".toMediaType()))
+            .addHeader("X-Profile-Id", profileId)
+            .addHeader("Content-Type", "application/json")
+            .addHeader("api-key", apiKey)
+            .build()
+
+        httpClient.newCall(request).enqueue(object : Callback {
+            override fun onFailure(call: Call, e: IOException) {
+                runOnUiThread {
+                    setStatus("❌ API Error: ${e.message}")
+                }
+            }
+
+            override fun onResponse(call: Call, response: Response) {
+                val responseBody = response.body?.string()
+                response.close()
+
+                runOnUiThread {
+                    if (response.isSuccessful) {
+                        Log.d("ThreeDSTest", "Auth Create Response: $responseBody")
+                        try {
+                            val jsonResponse = JSONObject(responseBody ?: "")
+                            authenticationId = jsonResponse.getString("authentication_id")
+                            setStatus("✅ Authentication created successfully. ID: $authenticationId")
+                            // Now call eligibility API
+                            callEligibilityApiCall()
+                        } catch (e: Exception) {
+                            setStatus("❌ Error parsing response: ${e.message}")
+                        }
+                    } else {
+                        setStatus("❌ API Error: ${response.code} - ${response.message}")
+                    }
+                }
+            }
+        })
+    }
+
+    private fun callEligibilityApiCall() {
+        if (authenticationId == null) {
+            setStatus("❌ Error: Authentication ID is required for eligibility call")
+            return
+        }
+
+        setStatus("🔄 Making eligibility API call...")
+
+        // Create request body for eligibility check with proper structure
+        val requestBody = JSONObject().apply {
+            put("payment_method", "card")
+            put("payment_method_data", JSONObject().apply {
+                put("card", JSONObject().apply {
+                    put("card_number", "5306889942833340")
+                    put("card_exp_month", "10")
+                    put("card_exp_year", "24")
+                    put("card_holder_name", "joseph Doe")
+                    put("card_cvc", "123")
+                })
+            })
+            put("billing", JSONObject().apply {
+                put("address", JSONObject().apply {
+                    put("line1", "1467")
+                    put("line2", "Harrison Street")
+                    put("line3", "Harrison Street")
+                    put("city", "San Fransico")
+                    put("state", "CA")
+                    put("zip", "94122")
+                    put("country", "US")
+                    put("first_name", "PiX")
+                })
+                put("phone", JSONObject().apply {
+                    put("number", "123456789")
+                    put("country_code", "12")
+                })
+            })
+            put("shipping", JSONObject().apply {
+                put("address", JSONObject().apply {
+                    put("line1", "1467")
+                    put("line2", "Harrison Street")
+                    put("line3", "Harrison Street")
+                    put("city", "San Fransico")
+                    put("state", "California")
+                    put("zip", "94122")
+                    put("country", "US")
+                    put("first_name", "PiX")
+                })
+                put("phone", JSONObject().apply {
+                    put("number", "123456789")
+                    put("country_code", "12")
+                })
+            })
+            put("email", "sahkasssslplanet@gmail.com")
+            put("browser_information", JSONObject().apply {
+                put("user_agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.110 Safari/537.36")
+                put("accept_header", "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8")
+                put("language", "nl-NL")
+                put("color_depth", 24)
+                put("screen_height", 723)
+                put("screen_width", 1536)
+                put("time_zone", 0)
+                put("java_enabled", true)
+                put("java_script_enabled", true)
+                put("ip_address", "115.99.183.2")
+            })
+        }
+
+        val request = Request.Builder()
+            .url("$baseUrl/authentication/$authenticationId/eligibility")
+            .post(requestBody.toString().toRequestBody("application/json".toMediaType()))
+            .addHeader("Content-Type", "application/json")
+            .addHeader("api-key", apiKey)
+            .build()
+
+        httpClient.newCall(request).enqueue(object : Callback {
+            override fun onFailure(call: Call, e: IOException) {
+                runOnUiThread {
+                    setStatus("❌ Eligibility API Error: ${e.message}")
+                }
+            }
+
+            override fun onResponse(call: Call, response: Response) {
+                val responseBody = response.body?.string()
+                response.close()
+
+                runOnUiThread {
+                    if (response.isSuccessful) {
+                        Log.d("ThreeDSTest", "Eligibility Response: $responseBody")
+                        try {
+                            val jsonResponse = JSONObject(responseBody ?: "")
+
+                            // Extract eligibility response data
+                            val eligibilityParams = jsonResponse.optJSONObject("eligibility_response_params")
+                            val threeDsData = eligibilityParams?.optJSONObject("ThreeDsData")
+
+                            if (threeDsData != null) {
+                                threeDsServerTransactionId = threeDsData.optString("three_ds_server_transaction_id")
+                                messageVersion = threeDsData.optString("message_version")
+                                directoryServerId = threeDsData.optString("directory_server_id")
+
+                                setStatus("✅ Eligibility completed - ready for transaction creation")
+                            } else {
+                                setStatus("✅ Eligibility completed - no 3DS data found")
+                            }
+                        } catch (e: Exception) {
+                            setStatus("❌ Error parsing eligibility response: ${e.message}")
+                        }
+                    } else {
+                        setStatus("❌ Eligibility API Error: ${response.code} - ${response.message}")
+                    }
+                }
+            }
+        })
+    }
+
+    private fun createTransactionAndGenerateAReq() {
+        try {
+            if (session == null) {
+                setStatus("❌ Error: Please initialize authentication session first")
+                return
+            }
+
+            if (authenticationId == null) {
+                setStatus("❌ Error: Please create authentication first")
+                return
+            }
+
+            // Create transaction with values from eligibility response
+            transaction = session!!.createTransaction(
+                directoryServerId ?: "",
+                messageVersion ?: "2.1.0",
+                "VISA"
+            )
+
+            setStatus("🔄 Generating AReq parameters...")
+
+            transaction!!.getAuthenticationRequestParameters { result ->
+                runOnUiThread {
+                    if (result != null) {
+                        aReqParams = result
+                        setStatus("✅ AReq generated - SDK Transaction ID: ${result.sdkTransactionID}")
+                    } else {
+                        setStatus("❌ Failed to generate AReq parameters")
+                    }
+                }
+            }
+
+        } catch (e: Exception) {
+            setStatus("❌ Error creating transaction: ${e.message}")
+            Log.e("ThreeDSTest", "Error in createTransactionAndGenerateAReq", e)
+        }
+    }
+
+    private fun makeAuthenticationApiCall() {
+        try {
+            if (authenticationId == null || aReqParams == null) {
+                setStatus("❌ Error: Please complete previous steps first")
+                return
+            }
+
+            setStatus("🔄 Making authentication API call...")
+
+            val requestBody = JSONObject().apply {
+                put("device_channel", "APP")
+                put("threeds_method_comp_ind", "N")
+                put("sdk_information", JSONObject().apply {
+                    put("sdk_app_id", aReqParams!!.sdkAppID)
+                    put("sdk_enc_data", aReqParams!!.deviceData) // Map deviceData to sdk_enc_data
+                    put("sdk_trans_id", aReqParams!!.sdkTransactionID)
+                    put("sdk_reference_number", aReqParams!!.sdkReferenceNumber)
+                    put("sdk_max_timeout", aReqParams!!.sdkMaxTimeout)
+
+                    // Parse and add sdk_ephem_pub_key if available
+                    aReqParams!!.sdkEphemeralPublicKey?.let { ephemeralKey ->
+                        try {
+                            val ephemeralKeyJson = JSONObject(ephemeralKey)
+                            put("sdk_ephem_pub_key", ephemeralKeyJson)
+                        } catch (e: Exception) {
+                            Log.w("ThreeDSTest", "Failed to parse sdkEphemeralPublicKey: ${e.message}")
+                        }
+                    }
+                })
+            }
+
+            val request = Request.Builder()
+                .url("$baseUrl/authentication/$authenticationId/authenticate")
+                .post(requestBody.toString().toRequestBody("application/json".toMediaType()))
+                .addHeader("Content-Type", "application/json")
+                .addHeader("api-key", apiKey)
+                .build()
+
+            httpClient.newCall(request).enqueue(object : Callback {
+                override fun onFailure(call: Call, e: IOException) {
+                    runOnUiThread {
+                        setStatus("❌ API Error: ${e.message}")
+                    }
+                }
+
+            override fun onResponse(call: Call, response: Response) {
+                val responseBody = response.body?.string()
+                response.close()
+
+                runOnUiThread {
+                    if (response.isSuccessful) {
+                        Log.d("ThreeDSTest", "Auth Response: $responseBody")
+                        try {
+                            val jsonResponse = JSONObject(responseBody ?: "")
+                            val transStatus = jsonResponse.optString("trans_status", "")
+
+                            if (transStatus == "C") {
+                                // Challenge required - extract challenge parameters
+                                challengeParameters = ChallengeParameters(
+                                    threeDSServerTransactionId = jsonResponse.optString("three_ds_server_transaction_id", ""),
+                                    acsTransactionId = jsonResponse.optString("acs_trans_id", ""),
+                                    acsReferenceNumber = jsonResponse.optString("acs_reference_number", ""),
+                                    acsSignedContent = jsonResponse.optString("acs_signed_content", ""),
+                                    threeDSRequestorAppURL = jsonResponse.optString("three_ds_requestor_app_url", ""),
+                                    transStatus = transStatus
+                                )
+                                setStatus("✅ Challenge required - Status: $transStatus")
+                            } else {
+                                setStatus("✅ Authentication completed - Status: $transStatus")
+                            }
+                        } catch (e: Exception) {
+                            setStatus("❌ Error parsing response: ${e.message}")
+                        }
+                    } else {
+                        setStatus("❌ API Error: ${response.code} - ${response.message}")
+                    }
+                }
+            }
+            })
+
+        } catch (e: Exception) {
+            setStatus("❌ Error making authentication API call: ${e.message}")
+            Log.e("ThreeDSTest", "Error in makeAuthenticationApiCall", e)
+        }
+    }
+
+    private fun performChallenge() {
+        try {
+            if (session == null || transaction == null || challengeParameters == null) {
+                setStatus("❌ Error: Please complete previous steps first")
+                return
+            }
+
+            val challengeParams = challengeParameters!!
+
+            if (challengeParams.transStatus == "C") {
+                setStatus("🔄 Challenge required, starting challenge flow...")
+
+                val challengeStatusReceiver = object : ChallengeStatusReceiver {
+                    override fun completed(completionEvent: CompletionEvent) {
+                        setStatus("✅ Challenge completed successfully - Transaction ID: ${completionEvent.transactionId}")
+                    }
+
+                    override fun cancelled() {
+                        setStatus("🚫 Challenge cancelled by user")
+                    }
+
+                    override fun timedout() {
+                        setStatus("⏰ Challenge timed out")
+                    }
+
+                    override fun protocolError(protocolErrorEvent: ProtocolErrorEvent) {
+                        setStatus("❌ Protocol error - Error: ${protocolErrorEvent.errorMessage.errorDescription}")
+                    }
+
+                    override fun runtimeError(runtimeErrorEvent: RuntimeErrorEvent) {
+                        setStatus("❌ Runtime error - Error: ${runtimeErrorEvent.errorMessage}")
+                    }
+                }
+
+                runOnUiThread {
+                    transaction!!.doChallenge(
+                        activity = this@ThreeDSTestActivity,
+                        challengeParameters = challengeParams,
+                        challengeStatusReceiver = challengeStatusReceiver,
+                        timeout = 5
+                    )
+                }
+
+            } else {
+                setStatus("✅ No challenge required - Status: ${challengeParams.transStatus}")
+            }
+
+        } catch (e: Exception) {
+            setStatus("❌ Error performing challenge: ${e.message}")
+            Log.e("ThreeDSTest", "Error in performChallenge", e)
+        }
+    }
+
+
+    private fun setStatus(message: String) {
+        runOnUiThread {
+            statusText.text = message
+            Log.d("ThreeDSTest", message)
+        }
+    }
+}
diff --git a/demo-app/src/main/res/layout/main_activity.xml b/demo-app/src/main/res/layout/main_activity.xml
index 1da14414..d40ca8c9 100644
--- a/demo-app/src/main/res/layout/main_activity.xml
+++ b/demo-app/src/main/res/layout/main_activity.xml
@@ -74,6 +74,18 @@
             android:textColor="#FFFFFF"
             android:textSize="20sp" />
 
+        <Button
+            android:id="@+id/launchAuthenticationButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="20dp"
+            android:layout_weight="1"
+            android:background="@drawable/rounded_button"
+            android:text="Launch 3DS Authentication"
+            android:textAllCaps="false"
+            android:textColor="#FFFFFF"
+            android:textSize="20sp" />
+
         <TextView
             android:id="@+id/resultText"
             android:layout_width="match_parent"
diff --git a/demo-app/src/main/res/layout/three_ds_test_activity.xml b/demo-app/src/main/res/layout/three_ds_test_activity.xml
new file mode 100644
index 00000000..5db41413
--- /dev/null
+++ b/demo-app/src/main/res/layout/three_ds_test_activity.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="16dp"
+    android:background="#F5F5F5">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="3DS Test Activity"
+        android:textSize="24sp"
+        android:textStyle="bold"
+        android:textColor="#333333"
+        android:gravity="center"
+        android:layout_marginBottom="24dp" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Test the 4 3DS functions by clicking the buttons below:"
+        android:textSize="16sp"
+        android:textColor="#666666"
+        android:gravity="center"
+        android:layout_marginBottom="32dp" />
+
+    <Button
+        android:id="@+id/btnInit3DS"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="1. Initialize 3DS SDK"
+        android:textSize="16sp"
+        android:layout_marginBottom="12dp"
+        android:background="#4CAF50"
+        android:textColor="@android:color/white"
+        android:padding="16dp" />
+
+    <Button
+        android:id="@+id/btnGenerateAReq"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="2. Generate AReq Parameters"
+        android:textSize="16sp"
+        android:layout_marginBottom="12dp"
+        android:background="#2196F3"
+        android:textColor="@android:color/white"
+        android:padding="16dp" />
+
+    <Button
+        android:id="@+id/btnReceiveChallenge"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="3. Receive Challenge Parameters"
+        android:textSize="16sp"
+        android:layout_marginBottom="12dp"
+        android:background="#FF9800"
+        android:textColor="@android:color/white"
+        android:padding="16dp" />
+
+    <Button
+        android:id="@+id/btnDoChallenge"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="4. Perform Challenge"
+        android:textSize="16sp"
+        android:layout_marginBottom="24dp"
+        android:background="#9C27B0"
+        android:textColor="@android:color/white"
+        android:padding="16dp" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Status:"
+        android:textSize="14sp"
+        android:textStyle="bold"
+        android:textColor="#333333"
+        android:layout_marginBottom="8dp" />
+
+    <TextView
+        android:id="@+id/statusText"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:text="Ready to test 3DS functions"
+        android:textSize="14sp"
+        android:textColor="#666666"
+        android:background="@android:color/white"
+        android:padding="12dp"
+        android:layout_marginBottom="16dp"
+        android:scrollbars="vertical" />
+
+    <Button
+        android:id="@+id/btnBack"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Back to Main"
+        android:textSize="16sp"
+        android:background="#757575"
+        android:textColor="@android:color/white"
+        android:padding="16dp" />
+
+</LinearLayout>
\ No newline at end of file