diff --git a/index.html b/index.html
index a722442..53befd4 100644
--- a/index.html
+++ b/index.html
@@ -11630,9 +11630,9 @@
     ----------------------------------------------------------------------------------->
 
     <script>
-        (function() {
+        //(function() {
             let localbitcoinplusplus = {};
-            function BitBang() {
+            //function BitBang() {
             
             //SECTION: INITIALIZATION
             localbitcoinplusplus = {
@@ -11660,8 +11660,8 @@
                 enumerable: false
             });
 
-            const ENVR = 'LIVE'; // LIVE, TEST  
-            const WS = 'wss';
+            const ENVR = 'TEST'; // LIVE, TEST  
+            const WS = 'ws';
             const DBName = "localbitcoinDBUser";
 
             if(DBName !== "localbitcoinDBUser") {
@@ -16962,7 +16962,8 @@
                                                                 supernode_token_balance_url = localbitcoinplusplus.server.flo_api_testnet;
                                                             }
 
-                                                            const supernode_token_balance = await helper_functions.ajaxGet(supernode_token_balance_url);
+                                                            const supernode_token_balance = await helper_functions
+                                                            .ajaxGet(`${supernode_token_balance_url}/api/v1.0/getFloAddressBalance?floAddress=${localbitcoinplusplus.wallets.my_local_flo_address}`);
                                                             if(typeof supernode_token_balance!=="object"
                                                             || typeof supernode_token_balance.floAddressBalances !== "object"
                                                             || supernode_token_balance.floAddressBalances[Object.keys(supernode_token_balance.floAddressBalances)]
@@ -17037,6 +17038,7 @@
                                                                     withdraw_amount: withdrawing_cash_amount,
                                                                     currency: params.currency,
                                                                     receivinAddress: encoded_bank_details,
+                                                                    receiver_flo_address: params.trader_flo_address,
                                                                     cashier_pubKey: getAPaymentHandler,
                                                                     status: 1 // withdraw request called
                                                                 };
@@ -17140,10 +17142,6 @@
                                                                                 );
 
                                                                                 // return back the response to client
-                                                                                withdraw_request_db_object_res.receiver_flo_address =
-                                                                                    params.trader_flo_address;
-                                                                                withdraw_request_db_object_res.trader_flo_address =
-                                                                                    params.trader_flo_address;
                                                                                 RM_RPC.send_rpc
                                                                                     .call(
                                                                                         this,
@@ -18726,7 +18724,8 @@
                                                                 supernode_token_balance_url = localbitcoinplusplus.server.flo_api_testnet;
                                                             }
 
-                                                            const supernode_token_balance = await helper_functions.ajaxGet(supernode_token_balance_url);
+                                                            const supernode_token_balance = await helper_functions
+                                                            .ajaxGet(`${supernode_token_balance_url}/api/v1.0/getFloAddressBalance?floAddress=${localbitcoinplusplus.wallets.my_local_flo_address}`);
                                                             if(typeof supernode_token_balance!=="object"
                                                             || typeof supernode_token_balance.floAddressBalances !== "object"
                                                             || Object.keys(supernode_token_balance.floAddressBalances)
@@ -18792,6 +18791,7 @@
                                                                     withdraw_amount: withdrawing_cash_amount,
                                                                     currency: params.currency,
                                                                     receivinAddress: encoded_bank_details,
+                                                                    receiver_flo_address: params.trader_flo_address,
                                                                     cashier_pubKey: getAPaymentHandler,
                                                                     status: 1 // withdraw request called
                                                                 };
@@ -18904,10 +18904,6 @@
                                                                                 );
 
                                                                                 // return back the response to client
-                                                                                withdraw_request_db_object_res.receiver_flo_address =
-                                                                                    params.trader_flo_address;
-                                                                                withdraw_request_db_object_res.trader_flo_address =
-                                                                                    params.trader_flo_address;
                                                                                 RM_RPC.send_rpc
                                                                                     .call(
                                                                                         this,
@@ -23638,6 +23634,7 @@
                                     if (
                                         typeof res_obj.params == "object" &&
                                         typeof res_obj.params[0] == "object"
+                                        && res_obj.params[0].trader_flo_address==localbitcoinplusplus.wallets.my_local_flo_address
                                     ) {
                                         if (
                                             RM_WALLET.verify(
@@ -25376,6 +25373,7 @@
                                     if (
                                         typeof res_obj.params == "object" &&
                                         typeof res_obj.params[0] == "object"
+                                        && res_obj.params[0].trader_flo_address==localbitcoinplusplus.wallets.my_local_flo_address
                                     ) {
                                         if (
                                             res_obj.params[0].trader_flo_address !==
@@ -31398,9 +31396,9 @@
                 }
                 rawFile.send(null);
             }
-            }
-           return BitBang();
-        })()
+           // }
+        //   return BitBang();
+        //})()
     </script>
 
   </body>