diff --git a/core/src/main/java/com/altude/core/config/SdkConfig.kt b/core/src/main/java/com/altude/core/config/SdkConfig.kt
index bbd6648..c97cfac 100644
--- a/core/src/main/java/com/altude/core/config/SdkConfig.kt
+++ b/core/src/main/java/com/altude/core/config/SdkConfig.kt
@@ -32,7 +32,7 @@ object SdkConfig {
     private var baseUrl: String =  "https://api.altude.so" //"http://10.0.2.2:5000/"//
     var apiKey: String = ""
     //lateinit var ownerKeyPair: Keypair
-    var isDevnet: Boolean = true
+    var isDevnet: Boolean = false
 
     @OptIn(ExperimentalTime::class)
     var apiConfig = ConfigResponse()
diff --git a/core/src/main/java/com/altude/core/data/SwapRequest.kt b/core/src/main/java/com/altude/core/data/SwapRequest.kt
index 00890b2..d424aaa 100644
--- a/core/src/main/java/com/altude/core/data/SwapRequest.kt
+++ b/core/src/main/java/com/altude/core/data/SwapRequest.kt
@@ -146,13 +146,13 @@ data class RoutePlan(
 @Serializable
 data class SwapInfo(
     val ammKey: String,
-    val label: String,
+    val label: String? = null,
     val inputMint: String,
     val outputMint: String,
     val inAmount: String,
     val outAmount: String,
-    val feeAmount: String,
-    val feeMint: String
+    val feeAmount: String? = null,
+    val feeMint: String? = null
 )
 
 @Serializable
diff --git a/gasstation/build.gradle.kts b/gasstation/build.gradle.kts
index ef67829..7797083 100644
--- a/gasstation/build.gradle.kts
+++ b/gasstation/build.gradle.kts
@@ -58,6 +58,9 @@ dependencies {
     implementation(libs.serialization.json) {
         exclude(group = "com.ditchoom")
     }
+//    implementation("com.solanamobile:web3-solana:0.2.5") {
+//        exclude(group = "com.ditchoom.buffer")
+//    }
 }
 
 
diff --git a/gasstation/src/androidTest/java/com/altude/gasstation/ExampleInstrumentedTest.kt b/gasstation/src/androidTest/java/com/altude/gasstation/ExampleInstrumentedTest.kt
index 0b42f1a..f907e26 100644
--- a/gasstation/src/androidTest/java/com/altude/gasstation/ExampleInstrumentedTest.kt
+++ b/gasstation/src/androidTest/java/com/altude/gasstation/ExampleInstrumentedTest.kt
@@ -281,8 +281,7 @@ class ExampleInstrumentedTest {
     @Test
     fun testSwap() = runBlocking {
         //Altude.savePrivateKey(accountPrivateKey )
-        val testMnemonic = System.getProperty("TEST_MNEMONIC") ?: ""
-        Altude.saveMnemonic(testMnemonic)
+        Altude.saveMnemonic("pause trial leisure wife deliver save crack sniff exact village claim upset")
         val option = SwapOption(
             account = "BG8ttfjfSdUVxJB5saKq59gfFdtpvDBeVTwg1X3ZBUyS",
             inputMint = Token.SOL.mint(),
@@ -293,7 +292,7 @@ class ExampleInstrumentedTest {
         )
 
         // Wrap the callback in a suspendable way (like a suspendCoroutine)
-        val result = Altude.swap(option)
+        val result = Altude.swap2(option)
         result
             .onSuccess { println("✅ Sent: ${it.Signature}") }
             .onFailure {
diff --git a/gasstation/src/main/java/com/altude/gasstation/GaslessManager.kt b/gasstation/src/main/java/com/altude/gasstation/GaslessManager.kt
index cf20c8e..77698b8 100644
--- a/gasstation/src/main/java/com/altude/gasstation/GaslessManager.kt
+++ b/gasstation/src/main/java/com/altude/gasstation/GaslessManager.kt
@@ -283,19 +283,20 @@ object GaslessManager {
                 if (ataInfo != null) {
                     val parsed = ataInfo.data?.parsed?.info
                     val balance = parsed?.tokenAmount?.uiAmount ?: 0.0
-
-                    if (parsed?.closeAuthority == feePayerPubKey.toBase58() || defaultWallet == null)
-                        authorized = feePayerPubKey
-                    else {
-                        authorized = defaultWallet.publicKey
-                        isOwnerRequiredSignature = true
+                    if(balance == 0.0 || token == Token.SOL.mint()){
+                        if (parsed?.closeAuthority == feePayerPubKey.toBase58() || defaultWallet == null)
+                            authorized = feePayerPubKey
+                        else {
+                            authorized = defaultWallet.publicKey
+                            isOwnerRequiredSignature = true
+                        }
+                        val instruction = TokenProgram.closeAtaAccount(
+                            ata = ata,
+                            destination = authorized,
+                            authority = authorized
+                        )
+                        txInstructions.add(instruction)
                     }
-                    val instruction = TokenProgram.closeAtaAccount(
-                        ata = ata,
-                        destination = authorized,
-                        authority = authorized
-                    )
-                    txInstructions.add(instruction)
 
 
                 }
diff --git a/smart-account/build.gradle.kts b/smart-account/build.gradle.kts
index 622a13a..2a9ae53 100644
--- a/smart-account/build.gradle.kts
+++ b/smart-account/build.gradle.kts
@@ -51,7 +51,7 @@ dependencies {
 //    //implementation("com.ditchoom:buffer-android:1.4.2")
 //
 //    testImplementation(platform("org.junit:junit-bom:5.13.4"))
-//    testImplementation("org.junit.jupiter:junit-jupiter")
+//    testImplementation("org.junit.swap:junit-swap")
 //    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 
     implementation("foundation.metaplex:solana:0.2.10"){