diff --git a/.gitignore b/.gitignore
index 16e0697372..ae9ed9c524 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,22 @@
 *.iml
-.gradle
-/local.properties
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-.DS_Store
+
+# Built application files
 /build
-/captures
-.externalNativeBuild
-.idea/vcs.xml
-.idea/caches
-.idea/dictionaries
-.idea/runConfigurations.xml
-.idea/encodings.xml
-.idea/codeStyles/codeStyleConfig.xml
-.idea/assetWizardSettings.xml
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Gradle generated files
+.gradle
+
+# User-specific configurations
+.idea/caches/
+.idea/libraries/
+.idea/*.xml
+
+# OS-specific files
+.DS_Store
+.DS_Store?
 
 # fastlane files
 **/fastlane/report.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 1dbc25d9a4..280cc6ed9d 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -11,6 +11,7 @@
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
+            <option value="$PROJECT_DIR$/blockchain" />
             <option value="$PROJECT_DIR$/server-android" />
             <option value="$PROJECT_DIR$/tangem-card-old" />
             <option value="$PROJECT_DIR$/tangem-core" />
diff --git a/app/build.gradle b/app/build.gradle
index 0a834a88d3..82e421bdfc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -125,7 +125,7 @@ dependencies {
     implementation 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0'
     implementation "com.orhanobut:hawk:2.0.1"
     implementation 'co.nstant.in:cbor:0.8'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.2'
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.2.2"
 //    implementation 'org.bitcoinj:bitcoinj-parent:0.14.7' //TODO: is this needed?
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2aa8bc39a8..02a922f1a6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -66,6 +66,16 @@
                     android:host="app.tangem.com"
                     android:scheme="https" />
             </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data
+                    android:scheme="vnd.android.nfc"
+                    android:host="ext"
+                    android:pathPrefix="/android.com:pkg"/>
+            </intent-filter>
+
             <intent-filter>
                 <action android:name="android.nfc.action.TECH_DISCOVERED" />
             </intent-filter>
diff --git a/app/src/main/java/com/tangem/data/Blockchain.java b/app/src/main/java/com/tangem/data/Blockchain.java
index 3f3a033388..3a76e07b04 100644
--- a/app/src/main/java/com/tangem/data/Blockchain.java
+++ b/app/src/main/java/com/tangem/data/Blockchain.java
@@ -9,6 +9,7 @@ public enum Blockchain {
     Unknown("", "", 1.0, R.drawable.ic_logo_unknown, ""),
     Bitcoin("BTC", "BTC", 100000000.0, R.drawable.ic_logo_bitcoin, "Bitcoin"),
     BitcoinTestNet("BTC/test", "BTC", 100000000.0, R.drawable.ic_logo_bitcoin_testnet, "Bitcoin Testnet"),
+    BitcoinDual("BTC/dual", "BTC", 100000000.0, R.drawable.ic_logo_bitcoin, "Bitcoin"),
     Ethereum("ETH", "ETH", 1.0, R.drawable.ic_logo_ethereum, "Ethereum"),
     EthereumId("ETH/ID", "ETH", 1.0, R.drawable.ic_logo_ethereum, "Ethereum ID"),
     EthereumTestNet("ETH/test", "ETH", 1.0, R.drawable.ic_logo_ethereum_testnet, "Ethereum Testnet"),
diff --git a/app/src/main/java/com/tangem/data/network/BlockchainInfoApi.java b/app/src/main/java/com/tangem/data/network/BlockchainInfoApi.java
index 70f4aae91d..7584a12d64 100644
--- a/app/src/main/java/com/tangem/data/network/BlockchainInfoApi.java
+++ b/app/src/main/java/com/tangem/data/network/BlockchainInfoApi.java
@@ -14,7 +14,7 @@ import retrofit2.http.Query;
 
 public interface BlockchainInfoApi {
     @GET(Server.ApiBlockchainInfo.Method.ADDRESS)
-    Single<BlockchainInfoAddress> blockchainInfoAddress(@Path("address") String address);
+    Single<BlockchainInfoAddress> blockchainInfoAddress(@Path("address") String address, @Query("offset") Integer offset);
 
     @GET(Server.ApiBlockchainInfo.Method.UTXO)
     Single<BlockchainInfoUnspents> blockchainInfoUnspents(@Query("active") String address);
diff --git a/app/src/main/java/com/tangem/data/network/BlockcypherApi.java b/app/src/main/java/com/tangem/data/network/BlockcypherApi.java
index d8de09d725..8bba6dfdee 100644
--- a/app/src/main/java/com/tangem/data/network/BlockcypherApi.java
+++ b/app/src/main/java/com/tangem/data/network/BlockcypherApi.java
@@ -15,13 +15,13 @@ import retrofit2.http.Query;
 
 public interface BlockcypherApi {
     @GET(Server.ApiBlockcypher.Method.MAIN)
-    Call<BlockcypherFee> blockcypherMain(@Path("blockchain") String blockchain, @Path("network") String network);
+    Call<BlockcypherFee> blockcypherMain(@Path("blockchain") String blockchain, @Path("network") String network, @Query("token") String token);
 
     @GET(Server.ApiBlockcypher.Method.ADDRESS)
-    Call<BlockcypherResponse> blockcypherAddress(@Path("blockchain") String blockchain, @Path("network") String network, @Path("address") String address);
+    Call<BlockcypherResponse> blockcypherAddress(@Path("blockchain") String blockchain, @Path("network") String network, @Path("address") String address, @Query("token") String token);
 
     @GET(Server.ApiBlockcypher.Method.TXS)
-    Call<BlockcypherTx> blockcypherTxs(@Path("blockchain") String blockchain, @Path("network") String network, @Path("txHash") String txHash);
+    Call<BlockcypherTx> blockcypherTxs(@Path("blockchain") String blockchain, @Path("network") String network, @Path("txHash") String txHash, @Query("token") String token);
 
     @Headers("Content-Type: application/json")
     @POST(Server.ApiBlockcypher.Method.PUSH)
diff --git a/app/src/main/java/com/tangem/data/network/Server.java b/app/src/main/java/com/tangem/data/network/Server.java
index 14117ed83b..29f69aba32 100644
--- a/app/src/main/java/com/tangem/data/network/Server.java
+++ b/app/src/main/java/com/tangem/data/network/Server.java
@@ -113,7 +113,7 @@ public class Server {
 
         public static class Method {
             static final String MAIN = URL_BLOCKCYPHER + V1_MAIN;
-            static final String ADDRESS = MAIN + "/addrs/{address}?unspentOnly=true&includeScript=true";
+            static final String ADDRESS = MAIN + "/addrs/{address}?includeScript=true&limit=2000";
             static final String TXS = MAIN + "/txs/{txHash}?includeHex=true";
             static final String PUSH = MAIN + "/txs/push";
         }
@@ -123,7 +123,7 @@ public class Server {
         public static final String URL_BLOCKCHAININFO = ServerURL.API_BLOCKCHAIN_INFO;
 
         public static class Method {
-            static final String ADDRESS = URL_BLOCKCHAININFO + "rawaddr/{address}?limit=5";
+            static final String ADDRESS = URL_BLOCKCHAININFO + "rawaddr/{address}";
             static final String UTXO = URL_BLOCKCHAININFO + "unspent";
 //            static final String TX = URL_BLOCKCHAININFO + "rawtx/{txHash}";
             static final String PUSH = URL_BLOCKCHAININFO + "pushtx";
diff --git a/app/src/main/java/com/tangem/data/network/ServerApiBlockchainInfo.java b/app/src/main/java/com/tangem/data/network/ServerApiBlockchainInfo.java
index 3697332b26..a16f25ddfc 100644
--- a/app/src/main/java/com/tangem/data/network/ServerApiBlockchainInfo.java
+++ b/app/src/main/java/com/tangem/data/network/ServerApiBlockchainInfo.java
@@ -5,9 +5,11 @@ import android.util.Log;
 import com.tangem.App;
 import com.tangem.data.network.model.BlockchainInfoAddress;
 import com.tangem.data.network.model.BlockchainInfoAddressAndUnspents;
+import com.tangem.data.network.model.BlockchainInfoTransaction;
 import com.tangem.data.network.model.BlockchainInfoUnspents;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import io.reactivex.Single;
 import io.reactivex.SingleObserver;
@@ -17,12 +19,13 @@ import okhttp3.ResponseBody;
 
 public class ServerApiBlockchainInfo {
     private static String TAG = ServerApiBlockchainInfo.class.getSimpleName();
+    private int page = 1;
 
     public void getAddressAndUnspents(String wallet, SingleObserver<BlockchainInfoAddressAndUnspents> addressAndUnspentsObserver) {
         Log.i(TAG, "new getAddressAndUnspents request");
         BlockchainInfoApi api = App.Companion.getNetworkComponent().getRetrofitBlockchainInfo().create(BlockchainInfoApi.class);
 
-        Single<BlockchainInfoAddress> addressObservable = api.blockchainInfoAddress(wallet);
+        Single<BlockchainInfoAddress> addressObservable = api.blockchainInfoAddress(wallet, null);
 
         Single<BlockchainInfoUnspents> unspentsObservable = api.blockchainInfoUnspents(wallet)
                 .onErrorReturnItem(new BlockchainInfoUnspents(new ArrayList<>()));
@@ -43,4 +46,17 @@ public class ServerApiBlockchainInfo {
 
         sendObservable.subscribe(sendObserver);
     }
+
+    public Single<List<BlockchainInfoTransaction>> getMoreAddressTxs(String wallet) {
+        Log.i(TAG, "new getAddress request");
+        BlockchainInfoApi api = App.Companion.getNetworkComponent().getRetrofitBlockchainInfo().create(BlockchainInfoApi.class);
+
+        Single<List<BlockchainInfoTransaction>> addressObservable = api.blockchainInfoAddress(wallet, page * 50)
+                .map(BlockchainInfoAddress::getTxs)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+
+        page++;
+        return addressObservable;
+    }
 }
diff --git a/app/src/main/java/com/tangem/data/network/ServerApiBlockcypher.java b/app/src/main/java/com/tangem/data/network/ServerApiBlockcypher.java
index 6b8bc2a6f1..bccbfd5a1e 100644
--- a/app/src/main/java/com/tangem/data/network/ServerApiBlockcypher.java
+++ b/app/src/main/java/com/tangem/data/network/ServerApiBlockcypher.java
@@ -32,8 +32,9 @@ public class ServerApiBlockcypher {
         return requestsCount <= 0;
     }
 
-    private ResponseListener responseListener;
+    private String apiKey = null;
 
+    private ResponseListener responseListener;
     private TxResponseListener txResponseListener;
 
     public interface ResponseListener {
@@ -68,20 +69,29 @@ public class ServerApiBlockcypher {
             blockchain = "btc";
             network = "test3";
         }
+        if (blockchainID.equals(Blockchain.Token.getID())) blockchain = "eth";
+        if (blockchainID.equals(Blockchain.BitcoinDual.getID())) blockchain = "btc";
 
         switch (method) {
             case BLOCKCYPHER_ADDRESS:
-                Call<BlockcypherResponse> addressCall = blockcypherApi.blockcypherAddress(blockchain, network, wallet);
+                Call<BlockcypherResponse> addressCall = blockcypherApi.blockcypherAddress(blockchain, network, wallet, apiKey);
                 addressCall.enqueue(new Callback<BlockcypherResponse>() {
                     @Override
                     public void onResponse(@NonNull Call<BlockcypherResponse> call, @NonNull Response<BlockcypherResponse> response) {
                         requestsCount--;
-                        if (response.code() == 200) {
-                            responseListener.onSuccess(method, response.body());
-                            Log.i(TAG, "requestData " + method + " onResponse " + response.code());
-                        } else {
-                            responseListener.onFail(method, String.valueOf(response.code()));
-                            Log.e(TAG, "requestData " + method + " onResponse " + response.code());
+                        switch (response.code()) {
+                            case 200:
+                                responseListener.onSuccess(method, response.body());
+                                Log.i(TAG, "requestData " + method + " onResponse " + response.code());
+                                break;
+                            case 429:
+                                apiKey = getRandomApiKey();
+                                requestData(blockchainID, method, wallet, tx);
+                                break;
+                            default:
+                                responseListener.onFail(method, String.valueOf(response.code()));
+                                Log.e(TAG, "requestData " + method + " onResponse " + response.code());
+                                break;
                         }
                     }
 
@@ -95,17 +105,24 @@ public class ServerApiBlockcypher {
                 break;
 
             case BLOCKCYPHER_FEE:
-                Call<BlockcypherFee> feeCall = blockcypherApi.blockcypherMain(blockchain, network);
+                Call<BlockcypherFee> feeCall = blockcypherApi.blockcypherMain(blockchain, network, apiKey);
                 feeCall.enqueue(new Callback<BlockcypherFee>() {
                     @Override
                     public void onResponse(@NonNull Call<BlockcypherFee> call, @NonNull Response<BlockcypherFee> response) {
                         requestsCount--;
-                        if (response.code() == 200) {
-                            responseListener.onSuccess(method, response.body());
-                            Log.i(TAG, "requestData " + method + " onResponse " + response.code());
-                        } else {
-                            responseListener.onFail(method, String.valueOf(response.code()));
-                            Log.e(TAG, "requestData " + method + " onResponse " + response.code());
+                        switch (response.code()) {
+                            case 200:
+                                responseListener.onSuccess(method, response.body());
+                                Log.i(TAG, "requestData " + method + " onResponse " + response.code());
+                                break;
+                            case 429:
+                                apiKey = getRandomApiKey();
+                                requestData(blockchainID, method, wallet, tx);
+                                break;
+                            default:
+                                responseListener.onFail(method, String.valueOf(response.code()));
+                                Log.e(TAG, "requestData " + method + " onResponse " + response.code());
+                                break;
                         }
                     }
 
@@ -119,17 +136,24 @@ public class ServerApiBlockcypher {
                 break;
 
             case BLOCKCYPHER_TXS:
-                Call<BlockcypherTx> txsCall = blockcypherApi.blockcypherTxs(blockchain, network, tx);
+                Call<BlockcypherTx> txsCall = blockcypherApi.blockcypherTxs(blockchain, network, tx, apiKey);
                 txsCall.enqueue(new Callback<BlockcypherTx>() {
                     @Override
                     public void onResponse(@NonNull Call<BlockcypherTx> call,@NonNull Response<BlockcypherTx> response) {
                         requestsCount--;
-                        if (response.code() == 200) {
-                            txResponseListener.onSuccess(response.body());
-                            Log.i(TAG, "requestData " + method + " onResponse " + response.code());
-                        } else {
-                            txResponseListener.onFail(String.valueOf(response.code()));
-                            Log.e(TAG, "requestData " + method + " onResponse " + response.code());
+                        switch (response.code()) {
+                            case 200:
+                                txResponseListener.onSuccess(response.body());
+                                Log.i(TAG, "requestData " + method + " onResponse " + response.code());
+                                break;
+                            case 429:
+                                apiKey = getRandomApiKey();
+                                requestData(blockchainID, method, wallet, tx);
+                                break;
+                            default:
+                                txResponseListener.onFail(String.valueOf(response.code()));
+                                Log.e(TAG, "requestData " + method + " onResponse " + response.code());
+                                break;
                         }
                     }
 
@@ -143,19 +167,24 @@ public class ServerApiBlockcypher {
                 break;
 
             case BLOCKCYPHER_SEND:
-                BlockcypherToken blockcypherToken = BlockcypherToken.values()[new Random().nextInt(BlockcypherToken.values().length)];
-
-                Call<BlockcypherResponse> sendCall = blockcypherApi.blockcypherPush(blockchain, network, new BlockcypherBody(tx), blockcypherToken.getToken());
+                Call<BlockcypherResponse> sendCall = blockcypherApi.blockcypherPush(blockchain, network, new BlockcypherBody(tx), apiKey);
                 sendCall.enqueue(new Callback<BlockcypherResponse>() {
                     @Override
                     public void onResponse(@NonNull Call<BlockcypherResponse> call, @NonNull Response<BlockcypherResponse> response) {
                         requestsCount--;
-                        if (response.code() == 201) {
-                            responseListener.onSuccess(method, response.body());
-                            Log.i(TAG, "requestData " + method + " onResponse " + response.code());
-                        } else {
-                            responseListener.onFail(method, String.valueOf(response.code()));
-                            Log.e(TAG, "requestData " + method + " onResponse " + response.code());
+                        switch (response.code()) {
+                            case 201:
+                                responseListener.onSuccess(method, response.body());
+                                Log.i(TAG, "requestData " + method + " onResponse " + response.code());
+                                break;
+                            case 429:
+                                apiKey = getRandomApiKey();
+                                requestData(blockchainID, method, wallet, tx);
+                                break;
+                            default:
+                                responseListener.onFail(method, String.valueOf(response.code()));
+                                Log.e(TAG, "requestData " + method + " onResponse " + response.code());
+                                break;
                         }
                     }
 
@@ -175,4 +204,9 @@ public class ServerApiBlockcypher {
                 break;
         }
     }
+
+    private String getRandomApiKey() {
+        return BlockcypherToken
+                .values()[new Random().nextInt(BlockcypherToken.values().length)].getToken();
+    }
 }
diff --git a/app/src/main/java/com/tangem/data/network/StellarRequest.java b/app/src/main/java/com/tangem/data/network/StellarRequest.java
index a7b66ce28e..fe4f27230c 100644
--- a/app/src/main/java/com/tangem/data/network/StellarRequest.java
+++ b/app/src/main/java/com/tangem/data/network/StellarRequest.java
@@ -4,11 +4,16 @@ import org.stellar.sdk.KeyPair;
 import org.stellar.sdk.Server;
 import org.stellar.sdk.Transaction;
 import org.stellar.sdk.requests.ErrorResponse;
+import org.stellar.sdk.requests.RequestBuilder;
 import org.stellar.sdk.responses.AccountResponse;
 import org.stellar.sdk.responses.LedgerResponse;
+import org.stellar.sdk.responses.Page;
 import org.stellar.sdk.responses.SubmitTransactionResponse;
+import org.stellar.sdk.responses.operations.OperationResponse;
 
 import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.List;
 
 /**
  * Created by dvol on 7.01.2019.
@@ -72,13 +77,37 @@ public class StellarRequest {
     public static class Ledgers extends Base {
         public LedgerResponse ledgerResponse;
 
-        public Ledgers() {};
+        public Ledgers() {
+        }
 
         @Override
         public void process(Server server) throws IOException {
-            int latestLedger = server.root().getCoreLatestLedger();
+            int latestLedger = server.root().getHistoryLatestLedger();
             ledgerResponse = server.ledgers().ledger(latestLedger);
         }
     }
 
+    public static class Operations extends Base {
+        KeyPair accountKeyPair;
+        public List<OperationResponse> operationsList;
+        int limit = 200;
+
+        public Operations(String walletAddress) {
+            accountKeyPair = KeyPair.fromAccountId(walletAddress);
+        }
+
+        @Override
+        public void process(Server server) throws IOException {
+            Page<OperationResponse> operationsResponse = server.operations().forAccount(accountKeyPair).limit(limit).order(RequestBuilder.Order.DESC).execute();
+            operationsList = operationsResponse.getRecords();
+            while (operationsResponse.getRecords().size() == limit) {
+                try {
+                    operationsResponse = operationsResponse.getNextPage(server.getHttpClient());
+                    operationsList.addAll(operationsResponse.getRecords());
+                } catch (URISyntaxException e) {
+                    break;
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/data/network/model/BlockchainInfoResponse.kt b/app/src/main/java/com/tangem/data/network/model/BlockchainInfoResponse.kt
index fab1d0c88f..8133dbf180 100644
--- a/app/src/main/java/com/tangem/data/network/model/BlockchainInfoResponse.kt
+++ b/app/src/main/java/com/tangem/data/network/model/BlockchainInfoResponse.kt
@@ -15,7 +15,10 @@ data class BlockchainInfoTransaction(
         var hash: String? = null,
 
         @SerializedName("block_height")
-        var block_height: Long? = null
+        var block_height: Long? = null,
+
+        @SerializedName("inputs")
+        var inputs: List<BlockchainInfoInput>
 )
 
 data class BlockchainInfoUnspents(
@@ -37,6 +40,16 @@ data class BlockchainInfoUtxo(
         var script: String? = null
 )
 
+data class BlockchainInfoInput(
+        @SerializedName("prev_out")
+        var prev_out: BlockchainInfoOutput
+)
+
+data class BlockchainInfoOutput(
+        @SerializedName("addr")
+        var addr: String? = null
+)
+
 data class BlockchainInfoAddressAndUnspents(
         var address: BlockchainInfoAddress,
         var unspents: BlockchainInfoUnspents
diff --git a/app/src/main/java/com/tangem/data/network/model/BlockcypherResponse.kt b/app/src/main/java/com/tangem/data/network/model/BlockcypherResponse.kt
index 484526bc4d..f3c2e951cd 100644
--- a/app/src/main/java/com/tangem/data/network/model/BlockcypherResponse.kt
+++ b/app/src/main/java/com/tangem/data/network/model/BlockcypherResponse.kt
@@ -13,13 +13,22 @@ data class BlockcypherResponse(
         var unconfirmed_balance: Long? = null,
 
         @SerializedName("txrefs")
-        var txrefs: List<BlockcypherTxref>? = null
+        var txrefs: List<BlockcypherTxref>? = null,
+
+        @SerializedName("unconfirmed_txrefs")
+        var unconfirmed_txrefs: List<BlockcypherTxref>? = null,
+
+        @SerializedName("hasMore")
+        var hasMore: Boolean? = null
 )
 
 data class BlockcypherTxref(
         @SerializedName("tx_hash")
         var tx_hash: String? = null,
 
+        @SerializedName("tx_input_n")
+        var tx_input_n: Int? = null,
+
         @SerializedName("tx_output_n")
         var tx_output_n: Int? = null,
 
@@ -30,7 +39,10 @@ data class BlockcypherTxref(
         var confirmations: Long? = null,
 
         @SerializedName("script")
-        var script: String? = null
+        var script: String? = null,
+
+        @SerializedName("spent")
+        var spent: Boolean? = null
 )
 
 data class BlockcypherTx(
diff --git a/app/src/main/java/com/tangem/ui/activity/MainActivity.kt b/app/src/main/java/com/tangem/ui/activity/MainActivity.kt
index 239286c65f..b479ad8094 100644
--- a/app/src/main/java/com/tangem/ui/activity/MainActivity.kt
+++ b/app/src/main/java/com/tangem/ui/activity/MainActivity.kt
@@ -32,8 +32,6 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
     lateinit var viewModel: GlobalViewModel
     lateinit var nfcManager: NfcManager
 
-//    private var onNfcReaderCallback: NfcAdapter.ReaderCallback? = null
-
     override fun onNewIntent(intent: Intent?) {
         super.onNewIntent(intent)
         if (intent != null && (NfcAdapter.ACTION_TECH_DISCOVERED == intent.action || NfcAdapter.ACTION_NDEF_DISCOVERED == intent.action)) {
@@ -68,15 +66,6 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
         nfcManager = NfcManager(this, this)
         lifecycle.addObserver(NfcLifecycleObserver(nfcManager))
 
-//        // NFC
-//        val intent = intent
-//        if (intent != null && (NfcAdapter.ACTION_TECH_DISCOVERED == intent.action || NfcAdapter.ACTION_NDEF_DISCOVERED == intent.action)) {
-//            val tag = intent.getParcelableExtra<Tag>(NfcAdapter.EXTRA_TAG)
-//            if (tag != null && onNfcReaderCallback != null) {
-//                onNfcReaderCallback?.onTagDiscovered(tag)
-//            }
-//        }
-
         // check if root device
         val rootBeer = RootBeer(this)
         if (rootBeer.isRootedWithoutBusyBoxCheck && !BuildConfig.DEBUG)
diff --git a/app/src/main/java/com/tangem/ui/fragment/id/IdFragment.kt b/app/src/main/java/com/tangem/ui/fragment/id/IdFragment.kt
index 76f14bc2bc..7c8ec384e4 100644
--- a/app/src/main/java/com/tangem/ui/fragment/id/IdFragment.kt
+++ b/app/src/main/java/com/tangem/ui/fragment/id/IdFragment.kt
@@ -364,7 +364,7 @@ class IdFragment : BaseFragment(), NfcAdapter.ReaderCallback,
         updateViews()
 
         // Bitcoin, Litecoin, BitcoinCash, Stellar
-        if (ctx.blockchain == Blockchain.Bitcoin || ctx.blockchain == Blockchain.BitcoinTestNet ||
+        if (ctx.blockchain == Blockchain.Bitcoin || ctx.blockchain == Blockchain.BitcoinTestNet || ctx.blockchain == Blockchain.BitcoinDual ||
                 ctx.blockchain == Blockchain.Litecoin || ctx.blockchain == Blockchain.BitcoinCash ||
                 ctx.blockchain == Blockchain.Stellar || ctx.blockchain == Blockchain.StellarTestNet || ctx.blockchain == Blockchain.StellarAsset) {
             ctx.coinData.setIsBalanceEqual(true)
diff --git a/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt b/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt
index db7e155e92..ca0505d7aa 100644
--- a/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt
+++ b/app/src/main/java/com/tangem/ui/fragment/wallet/LoadedWalletFragment.kt
@@ -56,7 +56,6 @@ import kotlinx.android.synthetic.main.layout_tangem_card.*
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import java.io.InputStream
-import java.nio.charset.StandardCharsets
 import java.text.SimpleDateFormat
 import java.util.*
 import kotlin.concurrent.timerTask
@@ -91,8 +90,8 @@ class LoadedWalletFragment : BaseFragment(), NavigationResultListener, NfcAdapte
             resources.getColorStateList(R.color.btn_dark)
     }
     private val activeColor: ColorStateList by lazy {
-        val color = if( (Util.bytesToHex(ctx.card?.cid)?.startsWith("10") == true)) {
-           R.color.start2coin_orange
+        val color = if ((Util.bytesToHex(ctx.card?.cid)?.startsWith("10") == true)) {
+            R.color.start2coin_orange
         } else {
             R.color.colorAccent
         }
@@ -530,12 +529,10 @@ class LoadedWalletFragment : BaseFragment(), NavigationResultListener, NfcAdapte
 
                     // TODO - remove, only for test&demo reason!
                     // TODO - begin
-                    if( cardProtocol.card.isIDCard)
-                    {
-                        if( cardProtocol.card.hasIDCardData() )
-                        {
+                    if (cardProtocol.card.isIDCard) {
+                        if (cardProtocol.card.hasIDCardData()) {
                             Toast.makeText(activity, "ID card: ${cardProtocol.card.idCardData.fullName}", Toast.LENGTH_SHORT).show()
-                        }else{
+                        } else {
                             Toast.makeText(activity, "Empty ID card", Toast.LENGTH_SHORT).show()
                         }
                     }
@@ -710,7 +707,7 @@ class LoadedWalletFragment : BaseFragment(), NavigationResultListener, NfcAdapte
         updateViews()
 
         // Bitcoin, Litecoin, BitcoinCash, Stellar
-        if (ctx.blockchain == Blockchain.Bitcoin || ctx.blockchain == Blockchain.BitcoinTestNet ||
+        if (ctx.blockchain == Blockchain.Bitcoin || ctx.blockchain == Blockchain.BitcoinTestNet || ctx.blockchain == Blockchain.BitcoinDual ||
                 ctx.blockchain == Blockchain.Litecoin || ctx.blockchain == Blockchain.BitcoinCash ||
                 ctx.blockchain == Blockchain.Stellar || ctx.blockchain == Blockchain.StellarTestNet || ctx.blockchain == Blockchain.StellarAsset) {
             ctx.coinData.setIsBalanceEqual(true)
@@ -773,7 +770,8 @@ class LoadedWalletFragment : BaseFragment(), NavigationResultListener, NfcAdapte
     }
 
     private fun showWarningIfPendingTransactionIsPossible() {
-        if (ctx.card.signedHashes > 0 && isNewCid(ctx.card.cidDescription)) {
+        if (ctx.card.signedHashes > 0 && isNewCid(ctx.card.cidDescription)
+                && ctx.card.signedHashes != ctx.coinData.sentTransactionsCount) {
             AlertDialog.Builder(context)
                     .setTitle(R.string.dialog_warning)
                     .setMessage(R.string.loaded_wallet_warning_card_signed_transactions)
@@ -808,33 +806,35 @@ class LoadedWalletFragment : BaseFragment(), NavigationResultListener, NfcAdapte
 
                 //TODO - remove, only for test
                 //TODO - begin
-                if( ctx.card.isIDCard && !ctx.card.hasIDCardData() )
-                {
-                    val idCardData=TangemCard.IDCardData()
-                    idCardData.fullName="John Doe"
-                    idCardData.birthday="1980-1-1"
-                    idCardData.gender="M"
-                    val dt= Date()
-                    idCardData.issueDate= SimpleDateFormat ("yyyy-MM-dd", Locale.US).format(dt)
+                if (ctx.card.isIDCard && !ctx.card.hasIDCardData()) {
+                    val idCardData = TangemCard.IDCardData()
+                    idCardData.fullName = "John Doe"
+                    idCardData.birthday = "1980-1-1"
+                    idCardData.gender = "M"
+                    val dt = Date()
+                    idCardData.issueDate = SimpleDateFormat("yyyy-MM-dd", Locale.US).format(dt)
                     dt.year = dt.year + 10
-                    idCardData.expireDate=SimpleDateFormat("yyyy-MM-dd", Locale.US).format(dt)
-                    idCardData.trustedAddress="GCOQLQT32RVH2MTWQGK5K3GIGT3STYG5323KMNTTFHIU2T5TFOGR4KDT" // ask D.Baturin
-                    idCardData.photo=Util.hexToBytes("FFD8FFE000104A46494600010101012C012C0000FFDB0043000A07070807060A0808080B0A0A0B0E18100E0D0D0E1D15161118231F2524221F2221262B372F26293429212230413134393B3E3E3E252E4449433C48373D3E3BFFDB0043010A0B0B0E0D0E1C10101C3B2822283B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3BFFC000110800C8007903012200021101031101FFC4001C0000020203010100000000000000000000000706080103050402FFC4003F100001030301050505060406020300000001020304000511060712213141135161718114223291A115235262B1C1428292D10816333472A2175393D2E1FFC4001801000301010000000000000000000000000002030104FFC4002111000202030100020301000000000000000001021103213112132232415142FFDA000C03010002110311003F007351451400562B35A83ED29F53097505D424294807DE4839C123B8E0FCA8016BB4CD712AC97FB642B72FDF8AA12A4273C179C84A0F811BC7D45306CF768B7BB547B9425EFB0FA3793DE3BC1F10720D579D75297335C5E1D5924A64A9B19EE4FBA3F4AECECDB5B7F96AE2604E708B64B57BC4F2617C82FC8F23E87A54164FB6C771D0FBA2BE50B4AD0149214923208E44566AE219A28A2800A28A2800A28A2800A28A2800A28A2803E5440049E02ABEFF009F26C5DA0C9D44CA94B69C74B6A673C16C03809F900478D580791DAB2B6F38DF494E7CEAA9BAD165E5B4AF89B5149F307151CADAAA1A28ECEB35B0FEAB9D322381C8D31424B4B1D52B483F30720F8835C4A3248009381CBC28AE76ED9444C7496D2AEDA65B44375227C04F04B2E2B0A6C7E45741E07879533AD7B55D2B7040ED662A0B879A2520A47F50C8FAD2028A78E468571459E6F53D85E46FB77AB7A93DE24A3FBD706EBB54D2D6DCA5B98A9CE0FE18A8DE1FD4709FAD57EC03D07CAB34CF3333C967B4E5F19D47638D7561B53687C1FBB5104A48241071E55EE932E3C3614FCA7DB61A4FC4E38A0948F5355F6C1B43BBE9BB02ED36F6D8CA9E538979D05451903202797319E3DFCAB8574BD5CEF6FF006D739CF4B5E78768AC84F90E43D053FCAA8CF2588B36AFB46A0B9C8856A7952BD99016E3C9410D8C9C0009E679F2E1C2BBB4BED8EDA7D8B4A393D69C393DE2A07F227DD4FD778FAD306A916DAB6630A28A298C31466B54A694FC575943CB654B414A5C47C4824731E2290978D5FAE2C976936C977B901E8EB2927711850E8A1EEF22307D69252F26A564CEFF00B49BCE92D48FDB6E36D8F2E383DA30EB6A2D296D9E5DE091C41F2A52DD65353AEF32630D29A6A43EB752DA8E4A428938FAD6FBBDFEEB7E5B4BBACD5CA532084296948290798E0077573AB9A53B2895051582A006490078D7C7B4320E3B44FCE9526CD3651520B268ABA6A0483024DB5448CEE19C82BF54A72457A6E9B37D51698AECA760B6FB2CA0AD6A61E4A8800649C7034530B22D45789570E3EEB7F335F22E0BEADA4F91A7F8A467A47BE83E15E76A634E1C1F70F8D7A291C5AE9A9D8D7B0ED76D36BB544B6AACB2D0DC6692D02D3885E70319C1C73A6258AFE9BEB1DBB76DB8446F190A96C86F7BCB8E4D56C813E55B26B53613CA62432ADE42D38C83EB4E2D15B556EF1218B5DE582CCD748436F3292A43A7C40E293F4F2ABC277A62490C8A2B159AB8862951B68B75B0B712E224B2D5C53F765927DF79BEFC7E53D4F426999738D2E5C25330E7182EAB876C9682D491E00F0CF8F1A40EBEB55AECB75EC5ABFBD75B82944CB5BC527B33D0139E2AF0E953C9C1A3D22F5A24C8EC123032A3CBBAB7020F2391E15BA2C11739B1E0938F68790D820711BCA033F5AE68D5EC77C3970E15C2F32D31E1467A5BEAE4DB482A3F21D2A52C6C8F5A3CD05FD9496F3C92E486D27E59A7BE9ED3569D236AF6580D25A42465E7DC237DC3F894AFDB90AC2F58E986DEEC57A86D895E71BA6523FBD59E47FE5095FD10917671AA23DFE0439B6A931DB7E4210A7D1EF21033C4EF24903866AC9169B2D762520B653BBBA78E538C63E55861F664B21E8EF21D695C96DA82927D452FB5D6D43EC49E6C7608E275D490859DD2A4B4A3FC21238A95E1C878F2A46DCDD1BA479E06C32C2D2D6B9B3A649CA894A1B21B4A46780EA4FCC56ABEEC36D521ADFB24C7A23C07FA7215DA215EB8C8FAD781AD21B56D449126E17E55B82F88695254D91FC8D8C0A1CD27B58D3A3B7817D55C528E3D9A649709FE57471F4AAF99FF004CB42E351E8FBDE977B72E509686C9C21E4FBCDABC94387EF5E78A9712C80E1C9E80F414D381B4C45E62CBD2FACA10B7497DB5305F282942564606FA4F141CE0E797952CD68536B5217F12490AF31CEA7372AA66C523E69F7B33B169F896166E76B57B5497D387A4B806FA55D518FE1C1E9D79E4D2523E9BD473612AE10EC52DF86919ED529F8C0E6523991E40D31F64F11C5155CAC3770EC65283770B74B6F716D9E8A041209EE381919071D371C5A7612636EB358159AE810876D3F53BDA6748BAEC3514CD96B11E3A8734920E543C40071E24579F44681B6E9EB434E4B88D49BA3C90B92FBC80B2147894A73C80E5E278D7236C984CCD2AE3BFEDD370FBDCF2E68E7E80D320F33E751CADF068A10FB53B4C5B56AF262212DA2530878B6848012AC949C01DFBB9F9D462D17362CD798572928538DC5792E96D3CD653C401EB8A97ED817BDACDB4FE086D8FAA8D426CD6A3A8355DBACFBC52890F250B23984F3511E80D4A11F5219BA44D615A358ED764AA6CE99EC1670B3B8307B3183C908CFBE47551F9F4AF5DE767DB39D33B912F5A9673531C00E13BAA207794A50703CE9CD162B16F84DC68ACA5A61840436DA0704A40E005548BD5CA45DEF32EE129654F48754B513D38F01E4070F4AEBAA264F275B6FDB305C7BEE9DBBA6E165998DD71232DAB23805A738F250EA3A72AEF6C36CAD4D72E5A9660EDE507BB1696BE25248DE5ABCCEF019F3EFAD5616C9FF0F574F6FE2CEF3AA8FBDD3DF4EEE3F9F35AF613A8988F26769F7D610B92A1223E7F89406149F3C007D0D0074F52EDBBEC8D46F5BADF6B6E5468AE169D756E9495A81C2B7703000391939CD31B4E5FE16A7B247BAC1512D3C38A55F121438149F106AB56BBB1CAB06AFB846908210E3CA759591C16DA89208EFE783E20D3736131E533A3E53AF052587A6294CE7AE1290A23C3231E8680241AFB41C1D636A5E1B437736924C6918C1CFE051EA93F4E755CD80F34F3B0DE4143CD28A0A55CC107047A1AB7279555FD6FD89DA4DE7D9F1B9ED4BCE3F163DEFF00B66926AE2CD5D2C6DAA208369870C0C7B3B086FE490297D15B1A676EC23C61D9C5BEC52B5B63E10BC28938FF009209FE6358D9AEBF125B458AF2F80F21388D21C57FA807F0289EA0723D478F3F88529BD5FB6F6675BD41E83648A52A7D1C50A5614381EBEF2CE3BF74D47174690D8159AC0ACD748847B5B694635869D76D8EB9D93A141C61DC6771C1C8F910483E06A0D17556BDD22C2605F74BBD7669801089914925491C8920107D403DF4DAAC1AC693E8595A3575FD7A9750BD725C572265296C30E1CA91BA3183E39CD78ECD25FD35A82D1A95D654A862491BC3AEEE02C79EEAABEF51C77226A3B8B0F496E53A990BED1D6F3BAA51393CFC4E3D29A7A2B4BDBB516CB99B7DC992B69F7DD752A4F0536ADE202927A1E15CD19799146AD0C5833A2DCA135321BE87E3BC90A6DC41C850A5DDD7629619B7B76E7EDF222C57165D7632027033C4E147E11E87151FFF00C6DAEF4BBEBFF2B5F7B48CA39DD4BDD913FF00242BDD27C73515D6E35D4211A2EA6B9BCEFB58514474C90A07040C94A78733C2BA1493E13A247AF351C7BF983A0B46321D8ADAD285167E070A79241EA91CCABA919E993D0D47B227A1DAA04ED32E94DD203490E84AB74BEB1C77D27A2B3D3A8C75E732D13A12D9A420A16D35DA5C1D6C07E439C559C64A53DC9CFCFAD4AAA32C8EF43A889DB6ED3AD5706D169DA1D8D0B9118E0BEE460BC1EF5208CA4F7E39F753021EBED12DC34262DF6DECB084E10D85767BA3B827031F2AF6DE74C593502026ED6D625103016A4E163C943047CE92BB50D176BD2371B649B7B0E88127783AD29D2AC292412013C46527E9548E452D18D5135D5BB67B6468AB89A68AA7CD706EA1EECC86DB27A8CF151EE0063F4A80CDD0D3ECFA3D3A8AEFBE89F2E5A53D8B87DE4A141472AFCC4E0E3A0F3A72E9DD17A5ECA96A65A6D8D071690B4487097178232082ACE3D315AF5E69995AAACCCC18D25A8FD9BE1E5A9C04E40491818F3A9CF25E91A908BB346B5CC9E98F769CEC261CE01F4341C4A4FE6191C3C45582D17A6E1699B0B70E1A98782CEFAA4328DDEDF3C94789CF0F1C776290B61F6190B7ED53FB3684C012CCB50FF6EF0CEE927F01CEEABCC1E94E6D9DE96BE69A82A6AE972438CAC6510D037C327A90B3FA018ADC46489AD158ACD5C50A8D6BBD4A9D33A69F94850F6B7BEE62A7BD67AFA0C9F4A92D41B6A3A818B1D89296D0DAAE52829A8CB29054D24FC6B07A70C0F323BA964E91A8439254A2A512493924F326AC2ECF59EC7425A138C6F31BFF00D4A27F7AAF237411BD9DDEB8EEAB31A762A6169CB6C54AD2B0D456D2149E4AF747115C654E8D26F5AA7EDADB7D9ADABE2DB1D82549F0C9715F4A7252727FDCFF0088C8CB74E12B537BB9F16303EB54C7D62C871F3E3DF59AC0E559A98C14BADB6C44BFA25A7F1EF4798820F8282927F6A62D2EB6D935B8FA25B8C4FBF265A02478241513FA7CE9E1F9215F092E8394A99A12CAF2CE55EC88493DFBBEEFED5DD75412DA94790493F4AE0E828AB85A12CCCB80857B225641E9BDEF7EF5EBD513D36BD2F729AA38ECA32F77FE44607D48A57D3570AD8A3BCA51E849A766CAB5A7DAF6FF00B127BB99B111F74A51E2F343F529E47C307BE92206001DD5E9B7CF936AB8313E1BA5A911D616DA8743FD8F235B097960D596A6B35C4D29A9236A8B1B370630959F75E6B3C5A58E63F71E04576EBAD3B247CA88032780155B3596A273536A491394486527B28E83FC2D83C3D4F127CE9F7AC2E3F65692BA4D070A6E32820FE623753F522AB3018E1DD51CCFF43C4CD3E76617B4DDB4830C2D797E01F677013C7747141FE9E1E8690D5DDD21AAA4E93BB898D23B561C1B9219CE37D3E1DC474FFF006B9C72C6528B6C76D936BBCDA757C2202D85A1A59CF25A49520F8E4647A577646D92C0DC7DE8F1273CEE3820A12819F1564FE94B2D57AB2E1ABA6076684B6C3790CC647C280799F127BE9E32A7663563CB4BEAEB5EACB737260BE80F1482EC62A1DA34AEA08EEEE3C8D77307B8FCAAA608AA69C0E47794D287220E08F222BD2A9B7B5A77177896A477190B23E59A6A8BE3336593BDEA8B2E9D8EA76E97165820706F7B79C578048E26945DA4FDB16B76886571EC9031BC09E286C9C9C9FC6BC63872C7852FC420A5153AE2964F3F1F5A9468BD52EE8FBA990D33DAC6753B8FB20E37873041EF1FDE8B8C79D0A6CB148425B42508484A523000E400E94ABDAF6A76D486F4EC570294141D9641F871F0A3CFA9F4AF8BFED8FB786A62C509D61D58C191237728FF008A46727C4FCA960E38E3CEADD756A71C5A8A94B51C9513CC935318F9A28A2B00636CD6DFAAECD3A3DCE2DB1C91699C901EDD751EF273C16015734FE9914EAE3E1503D8F5C7DAF46988A56550A42DBC7E557BC3F53F2A9ED76415224FA2F76CD70F66D28C4249C2A6494823BD281BC7EBBB490A636DA6E3DBEA285012ACA62C6DF50EE52CFF00648A5CD73E4772291E05145153342B5B921B68E16AC1EEC56CAF9536851CA90924778AD55FB035A65B0A380B03CC62B766B52E3B2B182D8F4E15AA3EF32FA982494E32934F49AD196CF551451533428A28A0028A283C050032B62971EC6F770B7295812180EA47E641C1FA2BE94E7CD577D1E6569BD79685CB41692FA90013F0ADB75380A07A8E23E5561BDEEEAEAC4FEB44E5D14ACE8E7B5DEB6B85F26A94DD9848DC694382A4A5184809EE4F0E2AF9782BA404894E840C2438A091DC327156A5C09663AB7404A508380060000555351DE515779CD4F2248D8B31451454470A28A2800A31451400514514005145140051451400E6D2F6585ADB6690187CF6732DEA5B6C4948CA995A5594F98C6EE454DF7F50FF00E9B77FF22FFF00AD2F762170CB374B6A95F0A90FA0798293FA0A6BD76436AC93E9E4B9AFB3B5CB5FE16167FEA6AAEC3892273A962334A75D282ADD4F3C049513E8013566F512FB3D37735E71BB0DD3FF0043506D9368F4C1B3AAF539A1ED13DBDD692A1F0327F7573F2C52CE3E9A46A7484C03919A2BD57582AB65DA64058C18CFADAF92881F4C5796B95940A28A2800A28A2800A28A2800A28A2803D56CB6C8BBDC1B811021521EC86D2B504EF9033BA09E1938E15F1360CBB74A5459B19D8CFA3E26DD4949AF88D25E8729A951D5B8F32B0E36A1D140E47E95635B8D65D75A6A24B9B09A92CC9682D3BC3DE6D5D40573041C8E1DD548414918DD0A2D935C3D8B5CB0D156133195B27CF1BC3EA9FAD3F37877D2AA4ECAE6586FB0EF1A7A47B5371A421D319E2038003C40572570CF3C7AD357753DD57C69A54C9B354B8ACCE88EC5909DF65E414389CFC493C08AD8942508094A425206001C80AFBAC550C2BFED56DDEC1AEA4B813BA898DA1F1E646E9FAA6A1D4DADB75BB2D5AEE694FC2A5C759F31BC9FD15503D21A4A66ADBA88AC65B8CDE15224638369F0EF51E83F6AE49C7ED48A27A38C224930CCC0C39ECC970345EDD3BA16464273DF8AD5565D5A4ED074C2B4EA6304C12DEE6E8F8B3F8F3F8B3C73DF55EF50D865E9BBD3F6C9832A6CE50B0301C41E4A1E7F439144F1F904ECE6515BE14291719CCC288D175F7D610DA075269FB6ED9D5958D22DD866C74C827EF1D7C7059748E2A49E631C8780AC841C8D6E8AF4738E0327A0A91EAAD1772D2A63BB2125D8B21092979238256464A15DC471C778AEF3BB31B95A758DB23A92A976C7E52712529F8520EF10B1D0E0791FA53A2E16F897582EC29CC25F8EF2775685F223F63E34F1C769D8AE4557A9AECE34546D5AEDC173CBA88CC361085B6AC10E2B883E3800F0F115E4D73A1A56919BDA2379FB6BCAFB97C8E293F817DC7C7AD37B67164FB1346C36DC4EEBF247B43BDF957103D13814421F6A66B7A14FAAB66B7AD39BF21A419F053C7B7653EF207E74F31E6323CAA5BB16BF769165D89D5E4B47DA18C9FE13C163D0E0FF0035353151D73455ADBD431EFB6F47B0CD6944B8591843E9230A0A4F2E3DE3AF7D51429DA16F448AB358159AA8A1451450047B5BE9B56A9D3ABB6B4E21A77B66DC42D7C9385713FD2555EDD3F6083A6ED4D5BA037BADA38A967E2715D54A3D49A28ACA5760752A21B43D1C9D5566DF8E948B8C50551D5CB7FBD04F71E9DC71E34514356A80E1ECA345AADB14DFAE2C944B7D2531DB58C169BEA48E855FA79D32A8A2B22A91AC3145145318689B062DC62391263087D874616DAC642856F4A424000600E94514019A28A2800A28A2803FFFD9")
+                    idCardData.expireDate = SimpleDateFormat("yyyy-MM-dd", Locale.US).format(dt)
+                    idCardData.trustedAddress = "GCOQLQT32RVH2MTWQGK5K3GIGT3STYG5323KMNTTFHIU2T5TFOGR4KDT" // ask D.Baturin
+                    idCardData.photo = Util.hexToBytes("FFD8FFE000104A46494600010101012C012C0000FFDB0043000A07070807060A0808080B0A0A0B0E18100E0D0D0E1D15161118231F2524221F2221262B372F26293429212230413134393B3E3E3E252E4449433C48373D3E3BFFDB0043010A0B0B0E0D0E1C10101C3B2822283B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3B3BFFC000110800C8007903012200021101031101FFC4001C0000020203010100000000000000000000000706080103050402FFC4003F100001030301050505060406020300000001020304000511060712213141135161718114223291A115235262B1C1428292D10816333472A2175393D2E1FFC4001801000301010000000000000000000000000002030104FFC4002111000202030100020301000000000000000001021103213112132232415142FFDA000C03010002110311003F007351451400562B35A83ED29F53097505D424294807DE4839C123B8E0FCA8016BB4CD712AC97FB642B72FDF8AA12A4273C179C84A0F811BC7D45306CF768B7BB547B9425EFB0FA3793DE3BC1F10720D579D75297335C5E1D5924A64A9B19EE4FBA3F4AECECDB5B7F96AE2604E708B64B57BC4F2617C82FC8F23E87A54164FB6C771D0FBA2BE50B4AD0149214923208E44566AE219A28A2800A28A2800A28A2800A28A2800A28A2803E5440049E02ABEFF009F26C5DA0C9D44CA94B69C74B6A673C16C03809F900478D580791DAB2B6F38DF494E7CEAA9BAD165E5B4AF89B5149F307151CADAAA1A28ECEB35B0FEAB9D322381C8D31424B4B1D52B483F30720F8835C4A3248009381CBC28AE76ED9444C7496D2AEDA65B44375227C04F04B2E2B0A6C7E45741E07879533AD7B55D2B7040ED662A0B879A2520A47F50C8FAD2028A78E468571459E6F53D85E46FB77AB7A93DE24A3FBD706EBB54D2D6DCA5B98A9CE0FE18A8DE1FD4709FAD57EC03D07CAB34CF3333C967B4E5F19D47638D7561B53687C1FBB5104A48241071E55EE932E3C3614FCA7DB61A4FC4E38A0948F5355F6C1B43BBE9BB02ED36F6D8CA9E538979D05451903202797319E3DFCAB8574BD5CEF6FF006D739CF4B5E78768AC84F90E43D053FCAA8CF2588B36AFB46A0B9C8856A7952BD99016E3C9410D8C9C0009E679F2E1C2BBB4BED8EDA7D8B4A393D69C393DE2A07F227DD4FD778FAD306A916DAB6630A28A298C31466B54A694FC575943CB654B414A5C47C4824731E2290978D5FAE2C976936C977B901E8EB2927711850E8A1EEF22307D69252F26A564CEFF00B49BCE92D48FDB6E36D8F2E383DA30EB6A2D296D9E5DE091C41F2A52DD65353AEF32630D29A6A43EB752DA8E4A428938FAD6FBBDFEEB7E5B4BBACD5CA532084296948290798E0077573AB9A53B2895051582A006490078D7C7B4320E3B44FCE9526CD3651520B268ABA6A0483024DB5448CEE19C82BF54A72457A6E9B37D51698AECA760B6FB2CA0AD6A61E4A8800649C7034530B22D45789570E3EEB7F335F22E0BEADA4F91A7F8A467A47BE83E15E76A634E1C1F70F8D7A291C5AE9A9D8D7B0ED76D36BB544B6AACB2D0DC6692D02D3885E70319C1C73A6258AFE9BEB1DBB76DB8446F190A96C86F7BCB8E4D56C813E55B26B53613CA62432ADE42D38C83EB4E2D15B556EF1218B5DE582CCD748436F3292A43A7C40E293F4F2ABC277A62490C8A2B159AB8862951B68B75B0B712E224B2D5C53F765927DF79BEFC7E53D4F426999738D2E5C25330E7182EAB876C9682D491E00F0CF8F1A40EBEB55AECB75EC5ABFBD75B82944CB5BC527B33D0139E2AF0E953C9C1A3D22F5A24C8EC123032A3CBBAB7020F2391E15BA2C11739B1E0938F68790D820711BCA033F5AE68D5EC77C3970E15C2F32D31E1467A5BEAE4DB482A3F21D2A52C6C8F5A3CD05FD9496F3C92E486D27E59A7BE9ED3569D236AF6580D25A42465E7DC237DC3F894AFDB90AC2F58E986DEEC57A86D895E71BA6523FBD59E47FE5095FD10917671AA23DFE0439B6A931DB7E4210A7D1EF21033C4EF24903866AC9169B2D762520B653BBBA78E538C63E55861F664B21E8EF21D695C96DA82927D452FB5D6D43EC49E6C7608E275D490859DD2A4B4A3FC21238A95E1C878F2A46DCDD1BA479E06C32C2D2D6B9B3A649CA894A1B21B4A46780EA4FCC56ABEEC36D521ADFB24C7A23C07FA7215DA215EB8C8FAD781AD21B56D449126E17E55B82F88695254D91FC8D8C0A1CD27B58D3A3B7817D55C528E3D9A649709FE57471F4AAF99FF004CB42E351E8FBDE977B72E509686C9C21E4FBCDABC94387EF5E78A9712C80E1C9E80F414D381B4C45E62CBD2FACA10B7497DB5305F282942564606FA4F141CE0E797952CD68536B5217F12490AF31CEA7372AA66C523E69F7B33B169F896166E76B57B5497D387A4B806FA55D518FE1C1E9D79E4D2523E9BD473612AE10EC52DF86919ED529F8C0E6523991E40D31F64F11C5155CAC3770EC65283770B74B6F716D9E8A041209EE381919071D371C5A7612636EB358159AE810876D3F53BDA6748BAEC3514CD96B11E3A8734920E543C40071E24579F44681B6E9EB434E4B88D49BA3C90B92FBC80B2147894A73C80E5E278D7236C984CCD2AE3BFEDD370FBDCF2E68E7E80D320F33E751CADF068A10FB53B4C5B56AF262212DA2530878B6848012AC949C01DFBB9F9D462D17362CD798572928538DC5792E96D3CD653C401EB8A97ED817BDACDB4FE086D8FAA8D426CD6A3A8355DBACFBC52890F250B23984F3511E80D4A11F5219BA44D615A358ED764AA6CE99EC1670B3B8307B3183C908CFBE47551F9F4AF5DE767DB39D33B912F5A9673531C00E13BAA207794A50703CE9CD162B16F84DC68ACA5A61840436DA0704A40E005548BD5CA45DEF32EE129654F48754B513D38F01E4070F4AEBAA264F275B6FDB305C7BEE9DBBA6E165998DD71232DAB23805A738F250EA3A72AEF6C36CAD4D72E5A9660EDE507BB1696BE25248DE5ABCCEF019F3EFAD5616C9FF0F574F6FE2CEF3AA8FBDD3DF4EEE3F9F35AF613A8988F26769F7D610B92A1223E7F89406149F3C007D0D0074F52EDBBEC8D46F5BADF6B6E5468AE169D756E9495A81C2B7703000391939CD31B4E5FE16A7B247BAC1512D3C38A55F121438149F106AB56BBB1CAB06AFB846908210E3CA759591C16DA89208EFE783E20D3736131E533A3E53AF052587A6294CE7AE1290A23C3231E8680241AFB41C1D636A5E1B437736924C6918C1CFE051EA93F4E755CD80F34F3B0DE4143CD28A0A55CC107047A1AB7279555FD6FD89DA4DE7D9F1B9ED4BCE3F163DEFF00B66926AE2CD5D2C6DAA208369870C0C7B3B086FE490297D15B1A676EC23C61D9C5BEC52B5B63E10BC28938FF009209FE6358D9AEBF125B458AF2F80F21388D21C57FA807F0289EA0723D478F3F88529BD5FB6F6675BD41E83648A52A7D1C50A5614381EBEF2CE3BF74D47174690D8159AC0ACD748847B5B694635869D76D8EB9D93A141C61DC6771C1C8F910483E06A0D17556BDD22C2605F74BBD7669801089914925491C8920107D403DF4DAAC1AC693E8595A3575FD7A9750BD725C572265296C30E1CA91BA3183E39CD78ECD25FD35A82D1A95D654A862491BC3AEEE02C79EEAABEF51C77226A3B8B0F496E53A990BED1D6F3BAA51393CFC4E3D29A7A2B4BDBB516CB99B7DC992B69F7DD752A4F0536ADE202927A1E15CD19799146AD0C5833A2DCA135321BE87E3BC90A6DC41C850A5DDD7629619B7B76E7EDF222C57165D7632027033C4E147E11E87151FFF00C6DAEF4BBEBFF2B5F7B48CA39DD4BDD913FF00242BDD27C73515D6E35D4211A2EA6B9BCEFB58514474C90A07040C94A78733C2BA1493E13A247AF351C7BF983A0B46321D8ADAD285167E070A79241EA91CCABA919E993D0D47B227A1DAA04ED32E94DD203490E84AB74BEB1C77D27A2B3D3A8C75E732D13A12D9A420A16D35DA5C1D6C07E439C559C64A53DC9CFCFAD4AAA32C8EF43A889DB6ED3AD5706D169DA1D8D0B9118E0BEE460BC1EF5208CA4F7E39F753021EBED12DC34262DF6DECB084E10D85767BA3B827031F2AF6DE74C593502026ED6D625103016A4E163C943047CE92BB50D176BD2371B649B7B0E88127783AD29D2AC292412013C46527E9548E452D18D5135D5BB67B6468AB89A68AA7CD706EA1EECC86DB27A8CF151EE0063F4A80CDD0D3ECFA3D3A8AEFBE89F2E5A53D8B87DE4A141472AFCC4E0E3A0F3A72E9DD17A5ECA96A65A6D8D071690B4487097178232082ACE3D315AF5E69995AAACCCC18D25A8FD9BE1E5A9C04E40491818F3A9CF25E91A908BB346B5CC9E98F769CEC261CE01F4341C4A4FE6191C3C45582D17A6E1699B0B70E1A98782CEFAA4328DDEDF3C94789CF0F1C776290B61F6190B7ED53FB3684C012CCB50FF6EF0CEE927F01CEEABCC1E94E6D9DE96BE69A82A6AE972438CAC6510D037C327A90B3FA018ADC46489AD158ACD5C50A8D6BBD4A9D33A69F94850F6B7BEE62A7BD67AFA0C9F4A92D41B6A3A818B1D89296D0DAAE52829A8CB29054D24FC6B07A70C0F323BA964E91A8439254A2A512493924F326AC2ECF59EC7425A138C6F31BFF00D4A27F7AAF237411BD9DDEB8EEAB31A762A6169CB6C54AD2B0D456D2149E4AF747115C654E8D26F5AA7EDADB7D9ADABE2DB1D82549F0C9715F4A7252727FDCFF0088C8CB74E12B537BB9F16303EB54C7D62C871F3E3DF59AC0E559A98C14BADB6C44BFA25A7F1EF4798820F8282927F6A62D2EB6D935B8FA25B8C4FBF265A02478241513FA7CE9E1F9215F092E8394A99A12CAF2CE55EC88493DFBBEEFED5DD75412DA94790493F4AE0E828AB85A12CCCB80857B225641E9BDEF7EF5EBD513D36BD2F729AA38ECA32F77FE44607D48A57D3570AD8A3BCA51E849A766CAB5A7DAF6FF00B127BB99B111F74A51E2F343F529E47C307BE92206001DD5E9B7CF936AB8313E1BA5A911D616DA8743FD8F235B097960D596A6B35C4D29A9236A8B1B370630959F75E6B3C5A58E63F71E04576EBAD3B247CA88032780155B3596A273536A491394486527B28E83FC2D83C3D4F127CE9F7AC2E3F65692BA4D070A6E32820FE623753F522AB3018E1DD51CCFF43C4CD3E76617B4DDB4830C2D797E01F677013C7747141FE9E1E8690D5DDD21AAA4E93BB898D23B561C1B9219CE37D3E1DC474FFF006B9C72C6528B6C76D936BBCDA757C2202D85A1A59CF25A49520F8E4647A577646D92C0DC7DE8F1273CEE3820A12819F1564FE94B2D57AB2E1ABA6076684B6C3790CC647C280799F127BE9E32A7663563CB4BEAEB5EACB737260BE80F1482EC62A1DA34AEA08EEEE3C8D77307B8FCAAA608AA69C0E47794D287220E08F222BD2A9B7B5A77177896A477190B23E59A6A8BE3336593BDEA8B2E9D8EA76E97165820706F7B79C578048E26945DA4FDB16B76886571EC9031BC09E286C9C9C9FC6BC63872C7852FC420A5153AE2964F3F1F5A9468BD52EE8FBA990D33DAC6753B8FB20E37873041EF1FDE8B8C79D0A6CB148425B42508484A523000E400E94ABDAF6A76D486F4EC570294141D9641F871F0A3CFA9F4AF8BFED8FB786A62C509D61D58C191237728FF008A46727C4FCA960E38E3CEADD756A71C5A8A94B51C9513CC935318F9A28A2B00636CD6DFAAECD3A3DCE2DB1C91699C901EDD751EF273C16015734FE9914EAE3E1503D8F5C7DAF46988A56550A42DBC7E557BC3F53F2A9ED76415224FA2F76CD70F66D28C4249C2A6494823BD281BC7EBBB490A636DA6E3DBEA285012ACA62C6DF50EE52CFF00648A5CD73E4772291E05145153342B5B921B68E16AC1EEC56CAF9536851CA90924778AD55FB035A65B0A380B03CC62B766B52E3B2B182D8F4E15AA3EF32FA982494E32934F49AD196CF551451533428A28A0028A283C050032B62971EC6F770B7295812180EA47E641C1FA2BE94E7CD577D1E6569BD79685CB41692FA90013F0ADB75380A07A8E23E5561BDEEEAEAC4FEB44E5D14ACE8E7B5DEB6B85F26A94DD9848DC694382A4A5184809EE4F0E2AF9782BA404894E840C2438A091DC327156A5C09663AB7404A508380060000555351DE515779CD4F2248D8B31451454470A28A2800A31451400514514005145140051451400E6D2F6585ADB6690187CF6732DEA5B6C4948CA995A5594F98C6EE454DF7F50FF00E9B77FF22FFF00AD2F762170CB374B6A95F0A90FA0798293FA0A6BD76436AC93E9E4B9AFB3B5CB5FE16167FEA6AAEC3892273A962334A75D282ADD4F3C049513E8013566F512FB3D37735E71BB0DD3FF0043506D9368F4C1B3AAF539A1ED13DBDD692A1F0327F7573F2C52CE3E9A46A7484C03919A2BD57582AB65DA64058C18CFADAF92881F4C5796B95940A28A2800A28A2800A28A2800A28A2803D56CB6C8BBDC1B811021521EC86D2B504EF9033BA09E1938E15F1360CBB74A5459B19D8CFA3E26DD4949AF88D25E8729A951D5B8F32B0E36A1D140E47E95635B8D65D75A6A24B9B09A92CC9682D3BC3DE6D5D40573041C8E1DD548414918DD0A2D935C3D8B5CB0D156133195B27CF1BC3EA9FAD3F37877D2AA4ECAE6586FB0EF1A7A47B5371A421D319E2038003C40572570CF3C7AD357753DD57C69A54C9B354B8ACCE88EC5909DF65E414389CFC493C08AD8942508094A425206001C80AFBAC550C2BFED56DDEC1AEA4B813BA898DA1F1E646E9FAA6A1D4DADB75BB2D5AEE694FC2A5C759F31BC9FD15503D21A4A66ADBA88AC65B8CDE15224638369F0EF51E83F6AE49C7ED48A27A38C224930CCC0C39ECC970345EDD3BA16464273DF8AD5565D5A4ED074C2B4EA6304C12DEE6E8F8B3F8F3F8B3C73DF55EF50D865E9BBD3F6C9832A6CE50B0301C41E4A1E7F439144F1F904ECE6515BE14291719CCC288D175F7D610DA075269FB6ED9D5958D22DD866C74C827EF1D7C7059748E2A49E631C8780AC841C8D6E8AF4738E0327A0A91EAAD1772D2A63BB2125D8B21092979238256464A15DC471C778AEF3BB31B95A758DB23A92A976C7E52712529F8520EF10B1D0E0791FA53A2E16F897582EC29CC25F8EF2775685F223F63E34F1C769D8AE4557A9AECE34546D5AEDC173CBA88CC361085B6AC10E2B883E3800F0F115E4D73A1A56919BDA2379FB6BCAFB97C8E293F817DC7C7AD37B67164FB1346C36DC4EEBF247B43BDF957103D13814421F6A66B7A14FAAB66B7AD39BF21A419F053C7B7653EF207E74F31E6323CAA5BB16BF769165D89D5E4B47DA18C9FE13C163D0E0FF0035353151D73455ADBD431EFB6F47B0CD6944B8591843E9230A0A4F2E3DE3AF7D51429DA16F448AB358159AA8A1451450047B5BE9B56A9D3ABB6B4E21A77B66DC42D7C9385713FD2555EDD3F6083A6ED4D5BA037BADA38A967E2715D54A3D49A28ACA5760752A21B43D1C9D5566DF8E948B8C50551D5CB7FBD04F71E9DC71E34514356A80E1ECA345AADB14DFAE2C944B7D2531DB58C169BEA48E855FA79D32A8A2B22A91AC3145145318689B062DC62391263087D874616DAC642856F4A424000600E94514019A28A2800A28A2803FFFD9")
 
-                    val writeTask=WriteIDCardTask(ctx.card, cardProtocol!!.reader,App.localStorage, App.pinStorage, idCardData, ctx.card.issuer.privateDataKey,
-                            object: CardProtocol.Notifications{
+                    val writeTask = WriteIDCardTask(ctx.card, cardProtocol!!.reader, App.localStorage, App.pinStorage, idCardData, ctx.card.issuer.privateDataKey,
+                            object : CardProtocol.Notifications {
                                 override fun onReadProgress(cardProtocol: CardProtocol?, progress: Int) {
-                                    LOG.i("WriteIDCardTask","onReadProgress: ${progress}%")
+                                    LOG.i("WriteIDCardTask", "onReadProgress: ${progress}%")
                                 }
+
                                 override fun onReadWait(msec: Int) {
                                 }
+
                                 override fun onReadStart(cardProtocol: CardProtocol?) {
-                                    LOG.i("WriteIDCardTask","onReadStart")
+                                    LOG.i("WriteIDCardTask", "onReadStart")
                                     rlProgressBar?.post { rlProgressBar?.visibility = View.VISIBLE }
 
                                 }
+
                                 override fun onReadCancel() {
-                                    LOG.i("WriteIDCardTask","onReadCancel")
+                                    LOG.i("WriteIDCardTask", "onReadCancel")
                                     rlProgressBar?.postDelayed({
                                         try {
                                             rlProgressBar?.visibility = View.GONE
@@ -844,8 +844,9 @@ class LoadedWalletFragment : BaseFragment(), NavigationResultListener, NfcAdapte
                                     }, 500)
 
                                 }
+
                                 override fun onReadFinish(cardProtocol: CardProtocol?) {
-                                    LOG.i("WriteIDCardTask","onReadFinish")
+                                    LOG.i("WriteIDCardTask", "onReadFinish")
                                     rlProgressBar?.postDelayed({
                                         try {
                                             rlProgressBar?.visibility = View.GONE
@@ -855,8 +856,10 @@ class LoadedWalletFragment : BaseFragment(), NavigationResultListener, NfcAdapte
                                     }, 500)
 
                                 }
+
                                 override fun onReadAfterRequest() {
                                 }
+
                                 override fun onReadBeforeRequest(timeout: Int) {
                                 }
                             })
diff --git a/app/src/main/java/com/tangem/wallet/CoinData.java b/app/src/main/java/com/tangem/wallet/CoinData.java
index 35b94be391..cac10cdc60 100644
--- a/app/src/main/java/com/tangem/wallet/CoinData.java
+++ b/app/src/main/java/com/tangem/wallet/CoinData.java
@@ -54,6 +54,10 @@ public abstract class CoinData {
             rate = B.getFloat("rate");
         if (B.containsKey("rateAlter"))
             rateAlter = B.getFloat("rateAlter");
+
+        if (B.containsKey("sentTransactionsCount")) {
+            sentTransactionsCount = B.getInt("sentTransactionsCount");
+        }
     }
 
     public void saveToBundle(Bundle B) {
@@ -70,6 +74,8 @@ public abstract class CoinData {
 
             B.putBoolean("balanceReceived", balanceReceived);
             B.putString("validationNodeDescription", validationNodeDescription);
+
+            B.putInt("sentTransactionsCount", sentTransactionsCount);
         } catch (Exception e) {
             Log.e("Can't save to bundle ", e.getMessage());
         }
@@ -83,8 +89,8 @@ public abstract class CoinData {
     }
 
     public static CoinData fromBundle(Blockchain blockchain, Bundle bundle) {
-        CoinEngine engine= CoinEngineFactory.INSTANCE.create(blockchain);
-        if( engine==null ) return null;
+        CoinEngine engine = CoinEngineFactory.INSTANCE.create(blockchain);
+        if (engine == null) return null;
         CoinData result = engine.createCoinData();
         result.loadFromBundle(bundle);
         return result;
@@ -143,11 +149,12 @@ public abstract class CoinData {
         setIsBalanceEqual(false);
         setBalanceReceived(false);
         setValidationNodeDescription("");
-        minFee=null;
-        maxFee=null;
-        normalFee=null;
-        rate=0f;
-        rateAlter=0f;
+        minFee = null;
+        maxFee = null;
+        normalFee = null;
+        rate = 0f;
+        rateAlter = 0f;
+        sentTransactionsCount = 0;
     }
 
 //    private AtomicInteger failedBalanceRequestCounter;
@@ -191,4 +198,14 @@ public abstract class CoinData {
     public CoinEngine.Amount minFee = null;
     public CoinEngine.Amount normalFee = null;
     public CoinEngine.Amount maxFee = null;
+
+    private int sentTransactionsCount = 0;
+
+    public int getSentTransactionsCount() {
+        return sentTransactionsCount;
+    }
+
+    public void incSentTransactionsCount() {
+        sentTransactionsCount++;
+    }
 }
diff --git a/app/src/main/java/com/tangem/wallet/CoinEngineFactory.kt b/app/src/main/java/com/tangem/wallet/CoinEngineFactory.kt
index 3d93e06d50..1570ea6621 100644
--- a/app/src/main/java/com/tangem/wallet/CoinEngineFactory.kt
+++ b/app/src/main/java/com/tangem/wallet/CoinEngineFactory.kt
@@ -5,6 +5,7 @@ import com.tangem.data.Blockchain
 import com.tangem.wallet.bch.BtcCashEngine
 import com.tangem.wallet.binance.BinanceEngine
 import com.tangem.wallet.btc.BtcEngine
+import com.tangem.wallet.btcmultisig.BtcMultisigEngine
 import com.tangem.wallet.cardano.CardanoData
 import com.tangem.wallet.cardano.CardanoEngine
 import com.tangem.wallet.ducatus.DucatusEngine
@@ -56,6 +57,7 @@ object CoinEngineFactory {
             Blockchain.Eos -> EosEngine()
             Blockchain.Ducatus -> DucatusEngine()
             Blockchain.Tezos -> TezosEngine()
+            Blockchain.BitcoinDual -> BtcMultisigEngine()
             else -> null
         }
     }
@@ -101,6 +103,8 @@ object CoinEngineFactory {
                 DucatusEngine(context)
             else if (Blockchain.Tezos == context.blockchain)
                 TezosEngine(context)
+            else if (Blockchain.BitcoinDual == context.blockchain)
+                BtcMultisigEngine(context)
             else
                 return null
         } catch (e: Exception) {
diff --git a/app/src/main/java/com/tangem/wallet/btc/BtcEngine.java b/app/src/main/java/com/tangem/wallet/btc/BtcEngine.java
index 49da3cd0a5..4bfa331eda 100644
--- a/app/src/main/java/com/tangem/wallet/btc/BtcEngine.java
+++ b/app/src/main/java/com/tangem/wallet/btc/BtcEngine.java
@@ -13,6 +13,7 @@ import com.tangem.data.network.ServerApiBlockcypher;
 import com.tangem.data.network.ServerApiCommon;
 import com.tangem.data.network.model.BlockchainInfoAddress;
 import com.tangem.data.network.model.BlockchainInfoAddressAndUnspents;
+import com.tangem.data.network.model.BlockchainInfoInput;
 import com.tangem.data.network.model.BlockchainInfoTransaction;
 import com.tangem.data.network.model.BlockchainInfoUnspents;
 import com.tangem.data.network.model.BlockchainInfoUtxo;
@@ -53,6 +54,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import io.reactivex.Single;
 import io.reactivex.SingleObserver;
 import io.reactivex.observers.DisposableSingleObserver;
 import okhttp3.ResponseBody;
@@ -179,7 +181,7 @@ public class BtcEngine extends CoinEngine {
                     return false;
             }
 
-            if (ctx.getBlockchain() != Blockchain.BitcoinTestNet && ctx.getBlockchain() != Blockchain.Bitcoin) {
+            if (ctx.getBlockchain() != Blockchain.BitcoinTestNet && ctx.getBlockchain() != Blockchain.Bitcoin && ctx.getBlockchain() != Blockchain.BitcoinDual) {
                 return false;
             }
 
@@ -188,7 +190,7 @@ public class BtcEngine extends CoinEngine {
             }
         } else {
             try {
-                if (ctx.getBlockchain() == Blockchain.Bitcoin) {
+                if (ctx.getBlockchain() == Blockchain.Bitcoin || ctx.getBlockchain() == Blockchain.BitcoinDual) {
                     SegwitAddress.fromBech32(new MainNetParams(), address);
                 } else if (ctx.getBlockchain() == Blockchain.BitcoinTestNet) {
                     SegwitAddress.fromBech32(new TestNet3Params(), address);
@@ -211,7 +213,7 @@ public class BtcEngine extends CoinEngine {
 
     @Override
     public Uri getWalletExplorerUri() {
-        return Uri.parse((ctx.getBlockchain() == Blockchain.Bitcoin ? "https://www.blockchain.com/btc/address/" : "https://live.blockcypher.com/btc-testnet/address/") + ctx.getCoinData().getWallet());
+        return Uri.parse((ctx.getBlockchain() == Blockchain.Bitcoin || ctx.getBlockchain() == Blockchain.BitcoinDual ? "https://www.blockchain.com/btc/address/" : "https://live.blockcypher.com/btc-testnet/address/") + ctx.getCoinData().getWallet());
     }
 
     @Override
@@ -576,30 +578,6 @@ public class BtcEngine extends CoinEngine {
                     BlockchainInfoAddress blockchainInfoAddress = blockchainInfoAddressAndUnspents.getAddress();
                     BlockchainInfoUnspents blockchainInfoUnspents = blockchainInfoAddressAndUnspents.getUnspents();
 
-                    if (blockchainInfoAddress.getFinal_balance() != null) {
-                        coinData.setBalanceReceived(true);
-                        coinData.setBalanceConfirmed(blockchainInfoAddress.getFinal_balance());
-                        coinData.setBalanceUnconfirmed(0L);
-                        coinData.setValidationNodeDescription(Server.ApiBlockchainInfo.URL_BLOCKCHAININFO);
-
-                        for (BlockchainInfoTransaction tx : blockchainInfoAddress.getTxs()) {
-                            if (tx.getBlock_height() == null) {
-                                coinData.setHasUnconfirmed(true);
-                            }
-                        }
-
-                        if (App.pendingTransactionsStorage.hasTransactions(ctx.getCard())) {
-                            for (PendingTransactionsStorage.TransactionInfo pendingTx : App.pendingTransactionsStorage.getTransactions(ctx.getCard()).getTransactions()) {
-                                String pendingTxId = BTCUtils.toHex(BTCUtils.reverse(CryptoUtil.doubleSha256(BTCUtils.fromHex(pendingTx.getTx()))));
-                                for (BlockchainInfoTransaction responseTx : blockchainInfoAddress.getTxs()) {
-                                    if (responseTx.getHash().equals(pendingTxId)) {
-                                        App.pendingTransactionsStorage.removeTransaction(ctx.getCard(), pendingTx.getTx());
-                                    }
-                                }
-                            }
-                        }
-                    }
-
                     for (BlockchainInfoUtxo utxo : blockchainInfoUnspents.getUnspent_outputs()) {
                         BtcData.UnspentTransaction trUnspent = new BtcData.UnspentTransaction();
                         trUnspent.txID = utxo.getTx_hash_big_endian();
@@ -609,7 +587,18 @@ public class BtcEngine extends CoinEngine {
                         coinData.getUnspentTransactions().add(trUnspent);
                     }
 
-                    blockchainRequestsCallbacks.onComplete(true);
+                    if (blockchainInfoAddress.getFinal_balance() != null) {
+                        coinData.setBalanceReceived(true);
+                        coinData.setBalanceConfirmed(blockchainInfoAddress.getFinal_balance());
+                        coinData.setBalanceUnconfirmed(0L);
+                        coinData.setValidationNodeDescription(Server.ApiBlockchainInfo.URL_BLOCKCHAININFO);
+                    }
+
+                    if (blockchainInfoAddress.getTxs() != null) {
+                        checkTransactionsBlockchainInfo(Single.just(blockchainInfoAddress.getTxs()), serverApiBlockchainInfo, blockchainRequestsCallbacks);
+                    } else {
+                        blockchainRequestsCallbacks.onComplete(true);
+                    }
                 }
 
                 @Override
@@ -648,14 +637,29 @@ public class BtcEngine extends CoinEngine {
                         coinData.setValidationNodeDescription(Server.ApiBlockcypher.URL_BLOCKCYPHER);
 
                         coinData.getUnspentTransactions().clear();
+                        //TODO: change request logic, 2000 tx max
                         if (blockcypherResponse.getTxrefs() != null) {
                             for (BlockcypherTxref txref : blockcypherResponse.getTxrefs()) {
-                                BtcData.UnspentTransaction trUnspent = new BtcData.UnspentTransaction();
-                                trUnspent.txID = txref.getTx_hash();
-                                trUnspent.amount = txref.getValue();
-                                trUnspent.outputN = txref.getTx_output_n();
-                                trUnspent.script = txref.getScript();
-                                coinData.getUnspentTransactions().add(trUnspent);
+                                if (txref.getTx_input_n() == -1) { //recieved only
+                                    if (!txref.getSpent()) {
+                                        BtcData.UnspentTransaction trUnspent = new BtcData.UnspentTransaction();
+                                        trUnspent.txID = txref.getTx_hash();
+                                        trUnspent.amount = txref.getValue();
+                                        trUnspent.outputN = txref.getTx_output_n();
+                                        trUnspent.script = txref.getScript();
+                                        coinData.getUnspentTransactions().add(trUnspent);
+                                    }
+                                } else { //sent only
+                                    coinData.incSentTransactionsCount();
+                                }
+                            }
+                        }
+
+                        if (blockcypherResponse.getUnconfirmed_txrefs() != null) {
+                            for (BlockcypherTxref unconfirmedTxref : blockcypherResponse.getUnconfirmed_txrefs()) {
+                                if (unconfirmedTxref.getTx_input_n() != -1) {
+                                    coinData.incSentTransactionsCount();
+                                }
                             }
                         }
                     } catch (Exception e) {
@@ -663,7 +667,7 @@ public class BtcEngine extends CoinEngine {
                         Log.e(TAG, "FAIL BLOCKCYPHER_ADDRESS Exception");
                     }
 
-                    checkPending(blockchainRequestsCallbacks);
+                    checkPendingBlockcypher(blockchainRequestsCallbacks);
                 }
 
                 public void onSuccess(String method, BlockcypherFee blockcypherFee) {
@@ -686,7 +690,59 @@ public class BtcEngine extends CoinEngine {
         }
     }
 
-    private void checkPending(BlockchainRequestsCallbacks blockchainRequestsCallbacks) {
+    private void checkTransactionsBlockchainInfo(Single<List<BlockchainInfoTransaction>> txsSingle, ServerApiBlockchainInfo serverApiBlockchainInfo, BlockchainRequestsCallbacks blockchainRequestsCallbacks) {
+        SingleObserver<List<BlockchainInfoTransaction>> txsObserver = new DisposableSingleObserver<List<BlockchainInfoTransaction>>() {
+            @Override
+            public void onSuccess(List<BlockchainInfoTransaction> txs) {
+                if (App.pendingTransactionsStorage.hasTransactions(ctx.getCard())) {
+                    for (PendingTransactionsStorage.TransactionInfo pendingTx : App.pendingTransactionsStorage.getTransactions(ctx.getCard()).getTransactions()) {
+                        String pendingTxId = BTCUtils.toHex(BTCUtils.reverse(CryptoUtil.doubleSha256(BTCUtils.fromHex(pendingTx.getTx()))));
+                        for (BlockchainInfoTransaction responseTx : txs) {
+                            if (pendingTxId.equals(responseTx.getHash())) {
+                                App.pendingTransactionsStorage.removeTransaction(ctx.getCard(), pendingTx.getTx());
+                            }
+                        }
+                    }
+                }
+
+                for (BlockchainInfoTransaction tx : txs) {
+                    if (tx.getBlock_height() == null) {
+                        coinData.setHasUnconfirmed(true);
+                    }
+
+                    for (BlockchainInfoInput input : tx.getInputs()) {
+                        String inputAddress = input.getPrev_out().getAddr();
+                        if (coinData.getWallet().equals(inputAddress)) {
+                            coinData.incSentTransactionsCount();
+                        }
+                    }
+                }
+
+                if (txs.size() == 50) {
+                    final ServerApiBlockchainInfo serverApiBlockchainInfo = new ServerApiBlockchainInfo();
+                    checkTransactionsBlockchainInfo(serverApiBlockchainInfo.getMoreAddressTxs(coinData.getWallet()), serverApiBlockchainInfo, blockchainRequestsCallbacks);
+                } else {
+                    blockchainRequestsCallbacks.onComplete(true);
+                }
+            }
+
+            @Override
+            public void onError(Throwable e) {
+                Log.i(TAG, "onError: getMoreAddressTxs" + e.getMessage());
+                coinData.setUseBlockcypher(true);
+                try {
+                    requestBalanceAndUnspentTransactions(blockchainRequestsCallbacks);
+                } catch (Exception ex) {
+                    ctx.setError(ex.getMessage());
+                    blockchainRequestsCallbacks.onComplete(false);
+                }
+            }
+        };
+
+        txsSingle.subscribe(txsObserver);
+    }
+
+    private void checkPendingBlockcypher(BlockchainRequestsCallbacks blockchainRequestsCallbacks) {
         if (App.pendingTransactionsStorage.hasTransactions(ctx.getCard())) {
             ServerApiBlockcypher serverApiBlockcypher = new ServerApiBlockcypher();
 
diff --git a/app/src/main/java/com/tangem/wallet/btcmultisig/BtcMultisigEngine.kt b/app/src/main/java/com/tangem/wallet/btcmultisig/BtcMultisigEngine.kt
new file mode 100644
index 0000000000..4f87b26d94
--- /dev/null
+++ b/app/src/main/java/com/tangem/wallet/btcmultisig/BtcMultisigEngine.kt
@@ -0,0 +1,137 @@
+package com.tangem.wallet.btcmultisig
+
+import com.google.common.primitives.UnsignedBytes
+import com.tangem.tangem_card.data.TangemCard
+import com.tangem.tangem_card.reader.CardProtocol.TangemException
+import com.tangem.tangem_card.tasks.SignTask
+import com.tangem.tangem_card.util.Util
+import com.tangem.wallet.TangemContext
+import com.tangem.wallet.btc.BtcEngine
+import org.bitcoinj.core.*
+import org.bitcoinj.crypto.TransactionSignature
+import org.bitcoinj.params.MainNetParams
+import org.bitcoinj.script.Script
+import org.bitcoinj.script.ScriptBuilder
+import java.math.BigInteger
+
+class BtcMultisigEngine : BtcEngine {
+    val networkParameters = MainNetParams.get()
+
+    constructor(): super()
+
+    constructor(context: TangemContext): super(context)
+
+    override fun defineWallet() {
+        try {
+            val wallet = calculateAddress(ctx.card.walletPublicKeyRar)
+            ctx.coinData.wallet = wallet
+        } catch (e: Exception) {
+            ctx.coinData.wallet = "ERROR"
+            throw TangemException("Can't define wallet address")
+        }
+    }
+
+    override fun calculateAddress(compressedPublicKey: ByteArray): String? {
+        if (ctx.card.issuerData != null && ctx.card.issuerData.size == 33) {
+            val script = createMultisigOutputScript()
+            val scriptHash = Utils.sha256hash160(script.program)
+            val address = LegacyAddress.fromScriptHash(networkParameters, scriptHash)
+            return address.toBase58()
+        } else {
+            return Util.byteArrayToHexString(compressedPublicKey)
+        }
+    }
+
+    override fun constructTransaction(amountValue: Amount, feeValue: Amount, IncFee: Boolean, targetAddress: String): SignTask.TransactionToSign {
+        val fee = convertToInternalAmount(feeValue).longValueExact()
+        var amount = convertToInternalAmount(amountValue).longValueExact()
+        var change = coinData.balanceInInternalUnits.longValueExact() - amount
+
+        if (IncFee) {
+            amount -= fee
+        } else {
+            change -= fee
+        }
+
+        val transaction = Transaction(networkParameters)
+
+        for (utxo in coinData.unspentTransactions) {
+            transaction.addInput(
+                    Sha256Hash.wrap(utxo.txID),
+                    utxo.outputN.toLong(),
+                    Script(Util.hexToBytes(utxo.script))
+            )
+        }
+
+        transaction.addOutput(
+                Coin.valueOf(amount),
+                Address.fromString(networkParameters, targetAddress)
+        )
+        if (change != 0L) {
+            transaction.addOutput(
+                    Coin.valueOf(change),
+                    Address.fromString(networkParameters, coinData.wallet)
+            )
+        }
+
+        return object : SignTask.TransactionToSign {
+            override fun isSigningMethodSupported(signingMethod: TangemCard.SigningMethod): Boolean {
+                return signingMethod == TangemCard.SigningMethod.Sign_Hash
+            }
+
+            override fun getHashesToSign(): Array<ByteArray> {
+                val hashesForSign: MutableList<ByteArray> = MutableList(transaction.inputs.size) { byteArrayOf() }
+                for (input in transaction.inputs) {
+                    val index = input.index
+                    val outputScript = createMultisigOutputScript()
+                    hashesForSign[index] = transaction.hashForSignature(index, outputScript, Transaction.SigHash.ALL, false).bytes
+                }
+                return hashesForSign.toTypedArray()
+            }
+
+            @Throws(java.lang.Exception::class)
+            override fun getRawDataToSign(): ByteArray {
+                throw java.lang.Exception("Signing of raw transaction not supported for " + this.javaClass.simpleName)
+            }
+
+            override fun getHashAlgToSign(): String {
+                return "sha-256x2"
+            }
+
+            @Throws(java.lang.Exception::class)
+            override fun getIssuerTransactionSignature(dataToSignByIssuer: ByteArray): ByteArray {
+                throw java.lang.Exception("Issuer validation not supported!")
+            }
+
+
+            override fun onSignCompleted(signFromCard: ByteArray): ByteArray {
+                for (index in transaction.inputs.indices) {
+                    transaction.inputs[index].scriptSig =
+                            createMultisigInputScript(index, signFromCard)
+                }
+                val txForSend = transaction.bitcoinSerialize()
+                notifyOnNeedSendTransaction(txForSend)
+                return txForSend
+            }
+        }
+    }
+
+    private fun createMultisigInputScript(index: Int, signedTransaction: ByteArray): Script {
+        val r = BigInteger(1, signedTransaction.copyOfRange(index * 64, 32 + index * 64))
+        val s = BigInteger(1, signedTransaction.copyOfRange(32 + index * 64, 64 + index * 64))
+        val canonicalS = ECKey.ECDSASignature(r, s).toCanonicalised().s
+        val signature = TransactionSignature(r, canonicalS)
+
+        val outputScript = createMultisigOutputScript()
+        return ScriptBuilder.createP2SHMultiSigInputScript(mutableListOf(signature), outputScript)
+    }
+
+    private fun createMultisigOutputScript(): Script {
+        val publicKeys =  mutableListOf(ctx.card.walletPublicKeyRar, ctx.card.issuerData)
+        publicKeys.sortWith(UnsignedBytes.lexicographicalComparator())
+        val publicEcKeys =
+                MutableList(publicKeys.size) { i -> ECKey.fromPublicOnly(publicKeys[i]) }
+
+        return Script(Script.createMultiSigOutputScript(1, publicEcKeys))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/wallet/eth/EthEngine.java b/app/src/main/java/com/tangem/wallet/eth/EthEngine.java
index 76e23e4771..aa70fccbe5 100644
--- a/app/src/main/java/com/tangem/wallet/eth/EthEngine.java
+++ b/app/src/main/java/com/tangem/wallet/eth/EthEngine.java
@@ -7,7 +7,11 @@ import android.util.Log;
 import com.tangem.App;
 import com.tangem.Constant;
 import com.tangem.data.Blockchain;
+import com.tangem.data.network.ServerApiBlockcypher;
 import com.tangem.data.network.ServerApiInfura;
+import com.tangem.data.network.model.BlockcypherFee;
+import com.tangem.data.network.model.BlockcypherResponse;
+import com.tangem.data.network.model.BlockcypherTxref;
 import com.tangem.data.network.model.InfuraResponse;
 import com.tangem.tangem_card.data.TangemCard;
 import com.tangem.tangem_card.tasks.SignTask;
@@ -463,7 +467,8 @@ public class EthEngine extends CoinEngine {
     @Override
     public void requestBalanceAndUnspentTransactions(BlockchainRequestsCallbacks blockchainRequestsCallbacks) {
         final ServerApiInfura serverApiInfura = new ServerApiInfura();
-        // request requestData listener
+        final ServerApiBlockcypher serverApiBlockcypher = new ServerApiBlockcypher();
+
         ServerApiInfura.ResponseListener responseListener = new ServerApiInfura.ResponseListener() {
             @Override
             public void onSuccess(String method, InfuraResponse infuraResponse) {
@@ -501,7 +506,7 @@ public class EthEngine extends CoinEngine {
                     break;
                 }
 
-                if (serverApiInfura.isRequestsSequenceCompleted()) {
+                if (serverApiInfura.isRequestsSequenceCompleted()&& serverApiBlockcypher.isRequestsSequenceCompleted()) {
                     blockchainRequestsCallbacks.onComplete(!ctx.hasError());
                 } else {
                     blockchainRequestsCallbacks.onProgress();
@@ -512,7 +517,7 @@ public class EthEngine extends CoinEngine {
             public void onFail(String method, String message) {
                 Log.e(TAG, "onFail: " + method + " " + message);
                 ctx.setError(message);
-                if (serverApiInfura.isRequestsSequenceCompleted()) {
+                if (serverApiInfura.isRequestsSequenceCompleted()&& serverApiBlockcypher.isRequestsSequenceCompleted()) {
                     blockchainRequestsCallbacks.onComplete(false);
                 } else {
                     blockchainRequestsCallbacks.onProgress();
@@ -521,9 +526,55 @@ public class EthEngine extends CoinEngine {
         };
         serverApiInfura.setResponseListener(responseListener);
 
+        ServerApiBlockcypher.ResponseListener blockcypherListener = new ServerApiBlockcypher.ResponseListener() {
+            @Override
+            public void onSuccess(String method, BlockcypherResponse blockcypherResponse) {
+                Log.i(TAG, "onSuccess: " + method);
+                try {
+                    //TODO: change request logic, 2000 tx max
+                    if (blockcypherResponse.getTxrefs() != null) {
+                        for (BlockcypherTxref txref : blockcypherResponse.getTxrefs()) {
+                            if (txref.getTx_input_n() != -1) { //sent only
+                                coinData.incSentTransactionsCount();
+                            }
+                        }
+                    }
+
+                    if (blockcypherResponse.getUnconfirmed_txrefs() != null) {
+                        for (BlockcypherTxref unconfirmedTxref : blockcypherResponse.getUnconfirmed_txrefs()) {
+                            if (unconfirmedTxref.getTx_input_n() != -1) {
+                                coinData.incSentTransactionsCount();
+                            }
+                        }
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    Log.e(TAG, "FAIL BLOCKCYPHER_ADDRESS Exception");
+                }
+
+                if (serverApiInfura.isRequestsSequenceCompleted()&& serverApiBlockcypher.isRequestsSequenceCompleted()) {
+                    blockchainRequestsCallbacks.onComplete(!ctx.hasError());
+                } else {
+                    blockchainRequestsCallbacks.onProgress();
+                }
+            }
+
+            public void onSuccess(String method, BlockcypherFee blockcypherFee) {
+                Log.e(TAG, "Wrong response type for requestBalanceAndUnspentTransactions");
+            }
+
+            @Override
+            public void onFail(String method, String message) {
+                Log.i(TAG, "onFail: " + method + " " + message);
+            }
+        };
+        serverApiBlockcypher.setResponseListener(blockcypherListener);
+
         serverApiInfura.requestData(ServerApiInfura.INFURA_ETH_GET_BALANCE, 67, coinData.getWallet(), "", "");
         serverApiInfura.requestData(ServerApiInfura.INFURA_ETH_GET_TRANSACTION_COUNT, 67, coinData.getWallet(), "", "");
         serverApiInfura.requestData(ServerApiInfura.INFURA_ETH_GET_PENDING_COUNT, 67, coinData.getWallet(), "", "");
+
+        serverApiBlockcypher.requestData(ctx.getBlockchain().getID(), ServerApiBlockcypher.BLOCKCYPHER_ADDRESS, ctx.getCoinData().getWallet(), "");
     }
 
     @Override
diff --git a/app/src/main/java/com/tangem/wallet/token/TokenEngine.java b/app/src/main/java/com/tangem/wallet/token/TokenEngine.java
index 9361789180..ac453d5ff9 100644
--- a/app/src/main/java/com/tangem/wallet/token/TokenEngine.java
+++ b/app/src/main/java/com/tangem/wallet/token/TokenEngine.java
@@ -8,7 +8,11 @@ import android.util.Log;
 import com.google.common.base.Strings;
 import com.tangem.App;
 import com.tangem.data.Blockchain;
+import com.tangem.data.network.ServerApiBlockcypher;
 import com.tangem.data.network.ServerApiInfura;
+import com.tangem.data.network.model.BlockcypherFee;
+import com.tangem.data.network.model.BlockcypherResponse;
+import com.tangem.data.network.model.BlockcypherTxref;
 import com.tangem.data.network.model.InfuraResponse;
 import com.tangem.tangem_card.data.TangemCard;
 import com.tangem.tangem_card.tasks.SignTask;
@@ -542,7 +546,7 @@ public class TokenEngine extends CoinEngine {
 
 
         int gasLimitInt = 60000;
-        if (amountValue.getCurrency().equals("DGX")) {
+        if (amountValue.getCurrency().equals("DGX") || amountValue.getCurrency().equals("CGT")) {
             gasLimitInt = 300000;
         }
 
@@ -639,7 +643,8 @@ public class TokenEngine extends CoinEngine {
     @Override
     public void requestBalanceAndUnspentTransactions(BlockchainRequestsCallbacks blockchainRequestsCallbacks) {
         final ServerApiInfura serverApiInfura = new ServerApiInfura();
-        // request requestData listener
+        final ServerApiBlockcypher serverApiBlockcypher = new ServerApiBlockcypher();
+
         ServerApiInfura.ResponseListener responseListener = new ServerApiInfura.ResponseListener() {
             @Override
             public void onSuccess(String method, InfuraResponse infuraResponse) {
@@ -701,7 +706,7 @@ public class TokenEngine extends CoinEngine {
                     break;
 
                 }
-                if (serverApiInfura.isRequestsSequenceCompleted()) {
+                if (serverApiInfura.isRequestsSequenceCompleted()&& serverApiBlockcypher.isRequestsSequenceCompleted()) {
                     blockchainRequestsCallbacks.onComplete(!ctx.hasError());
                 } else {
                     blockchainRequestsCallbacks.onProgress();
@@ -712,7 +717,7 @@ public class TokenEngine extends CoinEngine {
             public void onFail(String method, String message) {
                 Log.e(TAG, "onFail: " + method + " " + message);
                 ctx.setError(message);
-                if (serverApiInfura.isRequestsSequenceCompleted()) {
+                if (serverApiInfura.isRequestsSequenceCompleted()&& serverApiBlockcypher.isRequestsSequenceCompleted()) {
                     blockchainRequestsCallbacks.onComplete(false);
                 } else {
                     blockchainRequestsCallbacks.onProgress();
@@ -721,12 +726,58 @@ public class TokenEngine extends CoinEngine {
         };
         serverApiInfura.setResponseListener(responseListener);
 
+        ServerApiBlockcypher.ResponseListener blockcypherListener = new ServerApiBlockcypher.ResponseListener() {
+            @Override
+            public void onSuccess(String method, BlockcypherResponse blockcypherResponse) {
+                Log.i(TAG, "onSuccess: " + method);
+                try {
+                    //TODO: change request logic, 2000 tx max
+                    if (blockcypherResponse.getTxrefs() != null) {
+                        for (BlockcypherTxref txref : blockcypherResponse.getTxrefs()) {
+                            if (txref.getTx_input_n() != -1) { //sent only
+                                coinData.incSentTransactionsCount();
+                            }
+                        }
+                    }
+
+                    if (blockcypherResponse.getUnconfirmed_txrefs() != null) {
+                        for (BlockcypherTxref unconfirmedTxref : blockcypherResponse.getUnconfirmed_txrefs()) {
+                            if (unconfirmedTxref.getTx_input_n() != -1) {
+                                coinData.incSentTransactionsCount();
+                            }
+                        }
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    Log.e(TAG, "FAIL BLOCKCYPHER_ADDRESS Exception");
+                }
+
+                if (serverApiInfura.isRequestsSequenceCompleted()&& serverApiBlockcypher.isRequestsSequenceCompleted()) {
+                    blockchainRequestsCallbacks.onComplete(!ctx.hasError());
+                } else {
+                    blockchainRequestsCallbacks.onProgress();
+                }
+            }
+
+            public void onSuccess(String method, BlockcypherFee blockcypherFee) {
+                Log.e(TAG, "Wrong response type for requestBalanceAndUnspentTransactions");
+            }
+
+            @Override
+            public void onFail(String method, String message) {
+                Log.i(TAG, "onFail: " + method + " " + message);
+            }
+        };
+        serverApiBlockcypher.setResponseListener(blockcypherListener);
+
         if (validateAddress(getContractAddress(ctx.getCard()))) {
             serverApiInfura.requestData(ServerApiInfura.INFURA_ETH_CALL, 67, coinData.getWallet(), getContractAddress(ctx.getCard()), "");
         } else {
             ctx.setError("Smart contract address not defined");
             blockchainRequestsCallbacks.onComplete(false);
         }
+
+        serverApiBlockcypher.requestData(ctx.getBlockchain().getID(), ServerApiBlockcypher.BLOCKCYPHER_ADDRESS, ctx.getCoinData().getWallet(), "");
     }
 
     @Override
@@ -745,7 +796,7 @@ public class TokenEngine extends CoinEngine {
                 Log.i(TAG, "Infura gas price: " + gasPrice + " (" + l.toString() + ")");
                 BigInteger m;
                 if (!amount.getCurrency().equals(Blockchain.Ethereum.getCurrency()))
-                    if (amount.getCurrency().equals("DGX")) {
+                    if (amount.getCurrency().equals("DGX") || amount.getCurrency().equals("CGT")) {
                         m = BigInteger.valueOf(300000);
                     } else {
                         m = BigInteger.valueOf(60000);
diff --git a/app/src/main/java/com/tangem/wallet/xlm/XlmAssetData.java b/app/src/main/java/com/tangem/wallet/xlm/XlmAssetData.java
index 84c40a7b53..20c3ff0359 100644
--- a/app/src/main/java/com/tangem/wallet/xlm/XlmAssetData.java
+++ b/app/src/main/java/com/tangem/wallet/xlm/XlmAssetData.java
@@ -30,7 +30,7 @@ public class XlmAssetData extends CoinData {
     private Long sequenceNumber = 0L;
     private CoinEngine.Amount baseReserve = new CoinEngine.Amount("0.5", "XLM");
     private CoinEngine.Amount baseFee = new CoinEngine.Amount("0.00001", "XLM");
-    private boolean error404 = false;
+    private boolean error404, targetAccountCreated = false;
 
     @Override
     public void clearInfo() {
@@ -38,6 +38,7 @@ public class XlmAssetData extends CoinData {
         xlmBalance = null;
         assetBalance = null;
         error404 = false;
+        targetAccountCreated = false;
     }
 
     CoinEngine.Amount getXlmBalance() {
@@ -101,6 +102,14 @@ public class XlmAssetData extends CoinData {
             return true;
     }
 
+    public boolean isTargetAccountCreated() {
+        return targetAccountCreated;
+    }
+
+    public void setTargetAccountCreated(boolean targetAccountCreated) {
+        this.targetAccountCreated = targetAccountCreated;
+    }
+
     @Override
     public void loadFromBundle(Bundle B) {
         super.loadFromBundle(B);
@@ -137,6 +146,10 @@ public class XlmAssetData extends CoinData {
 
         if (B.containsKey("Error404")) error404 = B.getBoolean("Error404");
         else error404 = false;
+
+        if (B.containsKey("TargetAccountCreated"))
+            targetAccountCreated = B.getBoolean("TargetAccountCreated");
+        else targetAccountCreated = false;
     }
 
     @Override
@@ -169,6 +182,8 @@ public class XlmAssetData extends CoinData {
 
             if (error404) B.putBoolean("Error404", true);
 
+            if (targetAccountCreated) B.putBoolean("TargetAccountCreated", true);
+
         } catch (Exception e) {
             Log.e("Can't save to bundle ", e.getMessage());
         }
diff --git a/app/src/main/java/com/tangem/wallet/xlm/XlmAssetEngine.java b/app/src/main/java/com/tangem/wallet/xlm/XlmAssetEngine.java
index 394806cda9..1b5a8213cc 100644
--- a/app/src/main/java/com/tangem/wallet/xlm/XlmAssetEngine.java
+++ b/app/src/main/java/com/tangem/wallet/xlm/XlmAssetEngine.java
@@ -1,12 +1,10 @@
 package com.tangem.wallet.xlm;
 
 import android.net.Uri;
-import android.os.StrictMode;
 import android.text.InputFilter;
 import android.util.Log;
 
 import com.tangem.App;
-import com.tangem.data.Blockchain;
 import com.tangem.data.network.ServerApiStellar;
 import com.tangem.data.network.StellarRequest;
 import com.tangem.tangem_card.data.TangemCard;
@@ -28,6 +26,7 @@ import org.stellar.sdk.Operation;
 import org.stellar.sdk.PaymentOperation;
 import org.stellar.sdk.Transaction;
 import org.stellar.sdk.TransactionEx;
+import org.stellar.sdk.responses.operations.OperationResponse;
 
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -90,7 +89,7 @@ public class XlmAssetEngine extends CoinEngine {
 
         if (balance != null) {
             if (!coinData.isAssetBalanceZero()) {
-                return " " + assetBalance.toDescriptionString(getDecimals()) + "<br><small><small>"+ balance.toDescriptionString(getDecimals()) + " for fee + " + coinData.getReserve().toDescriptionString(getDecimals()) + " reserve</small></small>";
+                return " " + assetBalance.toDescriptionString(getDecimals()) + "<br><small><small>" + balance.toDescriptionString(getDecimals()) + " for fee + " + coinData.getReserve().toDescriptionString(getDecimals()) + " reserve</small></small>";
             }
             return " " + balance.toDescriptionString(getDecimals()) + "<br><small><small>+ " + coinData.getReserve().toDescriptionString(getDecimals()) + " reserve</small></small>";
         } else {
@@ -171,7 +170,7 @@ public class XlmAssetEngine extends CoinEngine {
 //        if (ctx.getCard().getDenomination() != null) {
 //            return Uri.parse(ctx.getCoinData().getWallet() + "?amount=" + convertToAmount(convertToInternalAmount(ctx.getCard().getDenomination())).toValueString());
 //        } else {
-            return Uri.parse(ctx.getCoinData().getWallet());
+        return Uri.parse(ctx.getCoinData().getWallet());
 //        }
     }
 
@@ -186,7 +185,7 @@ public class XlmAssetEngine extends CoinEngine {
 
         Amount balance;
         if (!coinData.isAssetBalanceZero()) {
-             balance = coinData.getAssetBalance();
+            balance = coinData.getAssetBalance();
         } else {
             balance = coinData.getXlmBalance();
         }
@@ -377,9 +376,6 @@ public class XlmAssetEngine extends CoinEngine {
     @Override
     public SignTask.TransactionToSign constructTransaction(Amount amountValue, Amount feeValue, boolean IncFee, String targetAddress) throws Exception {
         checkBlockchainDataExists();
-        StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitAll().build();
-
-        StrictMode.setThreadPolicy(policy);
 
         if (coinData.isAssetBalanceZero() && IncFee) {
             amountValue = new Amount(amountValue.subtract(feeValue), amountValue.getCurrency());
@@ -392,13 +388,13 @@ public class XlmAssetEngine extends CoinEngine {
             if (!coinData.isAssetBalanceZero()) {
                 operation = new PaymentOperation.Builder(KeyPair.fromAccountId(targetAddress), Asset.createNonNativeAsset(ctx.getCard().getTokenSymbol(), KeyPair.fromAccountId(ctx.getCard().getContractAddress())), amountValue.toValueString()).build();
             } else {
-                if (isAccountCreated(targetAddress))
+                if (coinData.isTargetAccountCreated())
                     operation = new PaymentOperation.Builder(KeyPair.fromAccountId(targetAddress), new AssetTypeNative(), amountValue.toValueString()).build();
                 else
                     operation = new CreateAccountOperation.Builder(KeyPair.fromAccountId(targetAddress), amountValue.toValueString()).build();
             }
         }
-        TransactionEx transaction = TransactionEx.buildEx(60, coinData.getAccountResponse(), operation);
+        TransactionEx transaction = TransactionEx.buildEx(120, coinData.getAccountResponse(), operation);
 
 
         if (transaction.getFee() != convertToInternalAmount(feeValue).intValueExact()) {
@@ -447,23 +443,40 @@ public class XlmAssetEngine extends CoinEngine {
     }
 
 
-    // network call inside, don't use on main thread
-    private boolean isAccountCreated(String address) {
+    private void checkTargetAccountCreated(BlockchainRequestsCallbacks blockchainRequestsCallbacks, String targetAddress, Amount amount) {
         final ServerApiStellar serverApi = new ServerApiStellar(ctx.getBlockchain());
 
-        StellarRequest.Balance request = new StellarRequest.Balance(address);
+        ServerApiStellar.Listener listener = new ServerApiStellar.Listener() {
+            @Override
+            public void onSuccess(StellarRequest.Base request) {
+                coinData.setTargetAccountCreated(true);
+                blockchainRequestsCallbacks.onComplete(true);
+            }
 
-        try {
-            serverApi.doStellarRequest(ctx, request);
-        } catch (IOException e) {
-            Log.e(TAG, e.getMessage());
-            return true; // suppose account is created if anything goes wrong TODO:check
-        }
 
-        if (request.errorResponse != null && request.errorResponse.getCode() == 404)
-            return false;
-        else
-            return true;
+            @Override
+            public void onFail(StellarRequest.Base request) {
+                Log.i(TAG, "onFail: " + request.getClass().getSimpleName() + " " + request.getError());
+
+                if (request.errorResponse != null && request.errorResponse.getCode() == 404) {
+                    coinData.setTargetAccountCreated(false);
+
+                    if (amount.compareTo(coinData.getReserve()) >= 0) { //TODO: take fee inclusion in account, now 1 XLM with fee included will fail after transaction is sent
+                        blockchainRequestsCallbacks.onComplete(true);
+                    } else {
+                        ctx.setError(R.string.confirm_transaction_error_not_enough_xlm_for_create);
+                        blockchainRequestsCallbacks.onComplete(false);
+                    }
+                } else { // suppose account is created if anything goes wrong
+                    coinData.setTargetAccountCreated(true);
+                    blockchainRequestsCallbacks.onComplete(true);
+                }
+            }
+        };
+
+        serverApi.setListener(listener);
+
+        serverApi.requestData(ctx, new StellarRequest.Balance(targetAddress));
     }
 
     @Override
@@ -496,6 +509,21 @@ public class XlmAssetEngine extends CoinEngine {
                     } else {
                         blockchainRequestsCallbacks.onProgress();
                     }
+                } else if (request instanceof StellarRequest.Operations) {
+                    StellarRequest.Operations operationsRequest = (StellarRequest.Operations) request;
+
+                    for (OperationResponse operationResponse : operationsRequest.operationsList) {
+                        if (operationResponse.getSourceAccount().getAccountId().equals(coinData.getWallet())) {
+                            coinData.incSentTransactionsCount();
+                        }
+                    }
+
+                    if (serverApi.isRequestsSequenceCompleted()) {
+                        blockchainRequestsCallbacks.onComplete(!ctx.hasError());
+                    } else {
+                        blockchainRequestsCallbacks.onProgress();
+                    }
+
                 } else {
                     ctx.setError("Invalid request logic");
                     blockchainRequestsCallbacks.onComplete(false);
@@ -529,13 +557,14 @@ public class XlmAssetEngine extends CoinEngine {
 
         serverApi.requestData(ctx, new StellarRequest.Balance(coinData.getWallet()));
         serverApi.requestData(ctx, new StellarRequest.Ledgers());
+        serverApi.requestData(ctx, new StellarRequest.Operations(coinData.getWallet()));
     }
 
     @Override
     public void requestFee(BlockchainRequestsCallbacks blockchainRequestsCallbacks, String targetAddress, Amount amount) throws Exception {
         // TODO: get fee stats?
         coinData.minFee = coinData.normalFee = coinData.maxFee = coinData.getBaseFee();
-        blockchainRequestsCallbacks.onComplete(true);
+        checkTargetAccountCreated(blockchainRequestsCallbacks, targetAddress, amount);
     }
 
     @Override
diff --git a/app/src/main/java/com/tangem/wallet/xlm/XlmEngine.java b/app/src/main/java/com/tangem/wallet/xlm/XlmEngine.java
index 3e2f6c8f77..493b45cc01 100644
--- a/app/src/main/java/com/tangem/wallet/xlm/XlmEngine.java
+++ b/app/src/main/java/com/tangem/wallet/xlm/XlmEngine.java
@@ -26,6 +26,7 @@ import org.stellar.sdk.Operation;
 import org.stellar.sdk.PaymentOperation;
 import org.stellar.sdk.Transaction;
 import org.stellar.sdk.TransactionEx;
+import org.stellar.sdk.responses.operations.OperationResponse;
 
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -97,7 +98,7 @@ public class XlmEngine extends CoinEngine {
     @Override
     public boolean hasBalanceInfo() {
         if (coinData == null) return false;
-        return (coinData.getBalance() != null) || (coinData.isError404()) ;
+        return (coinData.getBalance() != null) || (coinData.isError404());
     }
 
 
@@ -365,7 +366,7 @@ public class XlmEngine extends CoinEngine {
         else
             operation = new CreateAccountOperation.Builder(KeyPair.fromAccountId(targetAddress), amountValue.toValueString()).build();
 
-        TransactionEx transaction = TransactionEx.buildEx(60, coinData.getAccountResponse(), operation);
+        TransactionEx transaction = TransactionEx.buildEx(120, coinData.getAccountResponse(), operation);
 
 
         if (transaction.getFee() != convertToInternalAmount(feeValue).intValueExact()) {
@@ -470,6 +471,7 @@ public class XlmEngine extends CoinEngine {
                     } else {
                         blockchainRequestsCallbacks.onProgress();
                     }
+
                 } else if (request instanceof StellarRequest.Ledgers) {
                     StellarRequest.Ledgers ledgersRequest = (StellarRequest.Ledgers) request;
 
@@ -480,6 +482,22 @@ public class XlmEngine extends CoinEngine {
                     } else {
                         blockchainRequestsCallbacks.onProgress();
                     }
+
+                } else if (request instanceof StellarRequest.Operations) {
+                    StellarRequest.Operations operationsRequest = (StellarRequest.Operations) request;
+
+                    for (OperationResponse operationResponse : operationsRequest.operationsList) {
+                        if (operationResponse.getSourceAccount().getAccountId().equals(coinData.getWallet())) {
+                            coinData.incSentTransactionsCount();
+                        }
+                    }
+
+                    if (serverApi.isRequestsSequenceCompleted()) {
+                        blockchainRequestsCallbacks.onComplete(!ctx.hasError());
+                    } else {
+                        blockchainRequestsCallbacks.onProgress();
+                    }
+
                 } else {
                     ctx.setError("Invalid request logic");
                     blockchainRequestsCallbacks.onComplete(false);
@@ -513,6 +531,7 @@ public class XlmEngine extends CoinEngine {
 
         serverApi.requestData(ctx, new StellarRequest.Balance(coinData.getWallet()));
         serverApi.requestData(ctx, new StellarRequest.Ledgers());
+        serverApi.requestData(ctx, new StellarRequest.Operations(coinData.getWallet()));
     }
 
     @Override
diff --git a/blockchain/.gitignore b/blockchain/.gitignore
new file mode 100644
index 0000000000..796b96d1c4
--- /dev/null
+++ b/blockchain/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/blockchain/build.gradle b/blockchain/build.gradle
new file mode 100644
index 0000000000..ad3b46b318
--- /dev/null
+++ b/blockchain/build.gradle
@@ -0,0 +1,78 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
+android {
+    compileSdkVersion 29
+    buildToolsVersion "29.0.2"
+
+
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 29
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles 'consumer-rules.pro'
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+}
+
+dependencies {
+//    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation project(':tangem-core')
+    implementation project(':tangem-sdk')
+
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.core:core-ktx:1.1.0'
+
+    implementation 'com.squareup.retrofit2:retrofit:2.7.0'
+    implementation 'com.squareup.retrofit2:converter-moshi:2.6.0'
+    implementation 'com.squareup.moshi:moshi:1.9.2'
+    kapt("com.squareup.moshi:moshi-kotlin-codegen:1.9.2")
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.2.2'
+
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3'
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.3.3"
+
+    implementation 'org.bitcoinj:bitcoinj-core:0.15.2'
+    implementation 'com.github.stellar:java-stellar-sdk:0.13.0'
+
+    implementation "com.madgag.spongycastle:core:1.58.0.0"
+    implementation "com.madgag.spongycastle:prov:1.58.0.0"
+
+    ext.kethereum_version = '0.79.5'
+    implementation "com.github.walleth.kethereum:functions:$kethereum_version"
+    implementation "com.github.walleth.kethereum:keccak_shortcut:$kethereum_version"
+    implementation "com.github.walleth.kethereum:wallet:$kethereum_version"
+    implementation "com.github.walleth.kethereum:crypto_impl_spongycastle:$kethereum_version"
+    implementation "com.github.walleth.kethereum:crypto:$kethereum_version"
+    implementation "com.github.walleth.kethereum:crypto_api:$kethereum_version"
+    implementation "com.github.walleth.kethereum:model:$kethereum_version"
+    implementation 'com.github.komputing.khex:core:1.0.0-RC6'
+    implementation 'com.github.komputing.khex:extensions:1.0.0-RC6'
+
+    implementation 'co.nstant.in:cbor:0.8'
+
+    implementation files('libs/ripple-core-0.0.1.jar')
+    //4 dependencies for ripple-core
+    implementation 'net.i2p.crypto:eddsa:0.3.0'
+    implementation 'org.bouncycastle:bcprov-jdk15on:1.61'
+    //noinspection DuplicatePlatformClasses
+    implementation 'org.json:json:20180813'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.9.8'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.2'
+    testImplementation "com.google.truth:truth:1.0"
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+}
diff --git a/blockchain/libs/ripple-core-0.0.1.jar b/blockchain/libs/ripple-core-0.0.1.jar
new file mode 100644
index 0000000000..617db52b2d
Binary files /dev/null and b/blockchain/libs/ripple-core-0.0.1.jar differ
diff --git a/blockchain/proguard-rules.pro b/blockchain/proguard-rules.pro
new file mode 100644
index 0000000000..f1b424510d
--- /dev/null
+++ b/blockchain/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/blockchain/src/main/AndroidManifest.xml b/blockchain/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..83f5f31450
--- /dev/null
+++ b/blockchain/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+<manifest package="com.tangem.blockchain" />
diff --git a/blockchain/src/main/java/com/tangem/blockchain/bitcoin/BitcoinAddress.kt b/blockchain/src/main/java/com/tangem/blockchain/bitcoin/BitcoinAddress.kt
new file mode 100644
index 0000000000..01cdd30770
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/bitcoin/BitcoinAddress.kt
@@ -0,0 +1,72 @@
+package com.tangem.blockchain.bitcoin
+
+
+import com.tangem.common.extensions.calculateRipemd160
+import com.tangem.common.extensions.calculateSha256
+import org.bitcoinj.core.AddressFormatException
+import org.bitcoinj.core.Base58
+import org.bitcoinj.core.SegwitAddress
+import org.bitcoinj.params.MainNetParams
+import org.bitcoinj.params.TestNet3Params
+import java.security.MessageDigest
+
+class BitcoinAddressFactory {
+    companion object {
+        fun makeAddress(walletPublicKey: ByteArray, testNet: Boolean = false): String {
+            val netSelectionByte = if (testNet) 0x6f.toByte() else 0x00.toByte()
+            val hash1 = walletPublicKey.calculateSha256().calculateRipemd160()
+            val hash2 = byteArrayOf(netSelectionByte).plus(hash1).calculateSha256().calculateSha256()
+            val result = byteArrayOf(netSelectionByte) + hash1 + hash2[0] + hash2[1] + hash2[2] + hash2[3]
+            return Base58.encode(result)
+        }
+    }
+}
+
+class BitcoinAddressValidator {
+    companion object {
+
+        private const val firstLetters = "123nm"
+        private const val firstLettersNonTestNet = "13"
+
+        fun validate(address: String, testNet: Boolean = false): Boolean {
+            if (firstLetters.contains(address.first())) {
+                if (testNet && firstLettersNonTestNet.contains(address.first())) return false
+                if (address.length !in 26..35) return false
+                val decoded = address.decodeBase58() ?: return false
+                val hash = recursiveSha256(decoded, 0, 21, 2)
+                return hash.sliceArray(0..3).contentEquals(decoded.sliceArray(21..24))
+            } else {
+                return validateSegwitAddress(address, testNet)
+            }
+        }
+
+        private fun recursiveSha256(data: ByteArray, start: Int, len: Int, recursion: Int): ByteArray {
+            if (recursion == 0) return data
+            val md = MessageDigest.getInstance("SHA-256")
+            md.update(data.sliceArray(start until start + len))
+            return recursiveSha256(md.digest(), 0, 32, recursion - 1)
+        }
+
+        private fun String.decodeBase58(): ByteArray? {
+            return try {
+                Base58.decode(this)
+            } catch (exception: AddressFormatException) {
+                null
+            }
+        }
+
+        private fun validateSegwitAddress(address: String, testNet: Boolean): Boolean {
+            return try {
+                if (testNet) {
+                    SegwitAddress.fromBech32(TestNet3Params(), address)
+                    true
+                } else {
+                    SegwitAddress.fromBech32(MainNetParams(), address)
+                    true
+                }
+            } catch (e: Exception) {
+                false
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/bitcoin/BitcoinTransactionBuilder.kt b/blockchain/src/main/java/com/tangem/blockchain/bitcoin/BitcoinTransactionBuilder.kt
new file mode 100644
index 0000000000..d066fa259e
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/bitcoin/BitcoinTransactionBuilder.kt
@@ -0,0 +1,99 @@
+package com.tangem.blockchain.bitcoin
+
+import com.tangem.blockchain.common.TransactionData
+import com.tangem.blockchain.common.extensions.Result
+import com.tangem.blockchain.common.extensions.toCanonicalised
+import org.bitcoinj.core.*
+import org.bitcoinj.crypto.TransactionSignature
+import org.bitcoinj.script.Script
+import org.bitcoinj.script.ScriptBuilder
+import java.math.BigDecimal
+import java.math.BigInteger
+
+class BitcoinTransactionBuilder(private val testNet: Boolean) {
+
+    private lateinit var transaction: Transaction
+    private var networkParameters: NetworkParameters? = null
+    var unspentOutputs: List<UnspentTransaction>? = null
+
+    fun buildToSign(
+            transactionData: TransactionData): Result<List<ByteArray>> {
+
+        if (unspentOutputs == null) return Result.Failure(Exception("Currently there's an unconfirmed transaction"))
+
+        val change: BigDecimal = calculateChange(transactionData)
+
+        networkParameters = if (testNet) {
+            NetworkParameters.fromID(NetworkParameters.ID_TESTNET)
+        } else {
+            NetworkParameters.fromID(NetworkParameters.ID_MAINNET)
+        }
+        transaction = transactionData.toBitcoinJTransaction(networkParameters, unspentOutputs!!, change)
+
+        val hashesForSign: MutableList<ByteArray> = MutableList(transaction.inputs.size) { byteArrayOf() }
+        for (input in transaction.inputs) {
+            val index = input.index
+            hashesForSign[index] = transaction.hashForSignature(index, input.scriptBytes, Transaction.SigHash.ALL, false).bytes
+        }
+        return Result.Success(hashesForSign)
+    }
+
+    private fun calculateChange(transactionData: TransactionData): BigDecimal {
+        val fullAmount = unspentOutputs!!.map { it.amount }.reduce { acc, number -> acc + number }
+        return fullAmount - (transactionData.amount.value!! + (transactionData.fee?.value
+                ?: 0.toBigDecimal()))
+    }
+
+    fun buildToSend(signedTransaction: ByteArray, publicKey: ByteArray): ByteArray {
+        for (index in transaction.inputs.indices) {
+            transaction.inputs[index].scriptSig = createScript(index, signedTransaction, publicKey)
+        }
+        return transaction.bitcoinSerialize()
+    }
+
+    private fun createScript(index: Int, signedTransaction: ByteArray, publicKey: ByteArray): Script {
+        val r = BigInteger(1, signedTransaction.copyOfRange(index * 64, 32 + index * 64))
+        val s = BigInteger(1, signedTransaction.copyOfRange(32 + index * 64, 64 + index * 64))
+        val canonicalS = ECKey.ECDSASignature(r, s).toCanonicalised().s
+        val signature = TransactionSignature(r, canonicalS)
+        return ScriptBuilder.createInputScript(signature, ECKey.fromPublicOnly(publicKey))
+    }
+
+    fun getEstimateSize(transactionData: TransactionData, walletPublicKey: ByteArray): Result<Int> {
+        val buildTransactionResult = buildToSign(transactionData)
+        when (buildTransactionResult) {
+            is Result.Failure -> return buildTransactionResult
+            is Result.Success -> {
+                val hashes = buildTransactionResult.data
+                val finalTransaction = buildToSend(ByteArray(64 * hashes.size) { 1 }, walletPublicKey)
+                return Result.Success(finalTransaction.size)
+            }
+        }
+    }
+}
+
+internal fun TransactionData.toBitcoinJTransaction(networkParameters: NetworkParameters?,
+                                                   unspentOutputs: List<UnspentTransaction>,
+                                                   change: BigDecimal): Transaction {
+    val transaction = Transaction(networkParameters)
+    for (utxo in unspentOutputs) {
+        transaction.addInput(Sha256Hash.wrap(utxo.hash), utxo.outputIndex, Script(utxo.outputScript))
+    }
+    transaction.addOutput(
+            Coin.parseCoin(this.amount.value!!.toPlainString()),
+            Address.fromString(networkParameters, this.destinationAddress))
+    if (change != 0.toBigDecimal()) {
+        transaction.addOutput(
+                Coin.parseCoin(change.toPlainString()),
+                Address.fromString(networkParameters,
+                        this.sourceAddress))
+    }
+    return transaction
+}
+
+class UnspentTransaction(
+        val amount: BigDecimal,
+        val outputIndex: Long,
+        val hash: ByteArray,
+        val outputScript: ByteArray
+)
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/bitcoin/BitcoinWalletManager.kt b/blockchain/src/main/java/com/tangem/blockchain/bitcoin/BitcoinWalletManager.kt
new file mode 100644
index 0000000000..a1779ce5ae
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/bitcoin/BitcoinWalletManager.kt
@@ -0,0 +1,109 @@
+package com.tangem.blockchain.bitcoin
+
+import android.util.Log
+import com.tangem.blockchain.bitcoin.network.BitcoinAddressResponse
+import com.tangem.blockchain.bitcoin.network.BitcoinNetworkManager
+import com.tangem.blockchain.bitcoin.network.BitcoinNetworkManager.Companion.SATOSHI_IN_BTC
+import com.tangem.blockchain.common.*
+import com.tangem.blockchain.common.extensions.Result
+import com.tangem.blockchain.common.extensions.SimpleResult
+import com.tangem.blockchain.wallets.CurrencyWallet
+import com.tangem.common.extensions.toHexString
+import com.tangem.tasks.TaskEvent
+import java.math.BigDecimal
+
+class BitcoinWalletManager(
+        private val cardId: String,
+        private val walletPublicKey: ByteArray,
+        walletConfig: WalletConfig,
+        isTestNet: Boolean = false
+) : WalletManager,
+        TransactionSender,
+        FeeProvider {
+
+    override val blockchain = if (isTestNet) Blockchain.BitcoinTestnet else Blockchain.Bitcoin
+    private val address = blockchain.makeAddress(walletPublicKey)
+    private val currencyWallet = CurrencyWallet(walletConfig, address)
+    override var wallet: Wallet = currencyWallet
+    private val transactionBuilder = BitcoinTransactionBuilder(isTestNet)
+    private val networkManager = BitcoinNetworkManager(isTestNet)
+
+    override suspend fun update() {
+        val response = networkManager.getInfo(address)
+        when (response) {
+            is Result.Success -> updateWallet(response.data)
+            is Result.Failure -> updateError(response.error)
+        }
+    }
+
+    private fun updateWallet(response: BitcoinAddressResponse) {
+        Log.d(this::class.java.simpleName, "Balance is ${response.balance}")
+        currencyWallet.balances[AmountType.Coin]?.value = response.balance
+        transactionBuilder.unspentOutputs = response.unspentTransactions
+        if (response.hasUnconfirmed) {
+            if (currencyWallet.pendingTransactions.isEmpty()) {
+                currencyWallet.pendingTransactions.add(TransactionData(
+                        Amount(blockchain.currency, decimals = blockchain.decimals),
+                        null,
+                        "unknown",
+                        currencyWallet.address))
+            }
+        } else {
+            currencyWallet.pendingTransactions.clear()
+        }
+    }
+
+    private fun updateError(error: Throwable?) {
+        Log.e(this::class.java.simpleName, error?.message ?: "")
+    }
+
+    override suspend fun send(transactionData: TransactionData, signer: TransactionSigner): SimpleResult {
+        val buildTransactionResult = transactionBuilder.buildToSign(transactionData)
+        when (buildTransactionResult) {
+            is Result.Failure -> return SimpleResult.Failure(buildTransactionResult.error)
+            is Result.Success -> {
+                when (val signerResponse = signer.sign(buildTransactionResult.data.toTypedArray(), cardId)) {
+                    is TaskEvent.Event -> {
+                        val transactionToSend = transactionBuilder.buildToSend(signerResponse.data.signature, walletPublicKey)
+                        return networkManager.sendTransaction(transactionToSend.toHexString())
+                    }
+                    is TaskEvent.Completion -> return SimpleResult.Failure(signerResponse.error)
+                }
+            }
+        }
+    }
+
+    override suspend fun getFee(amount: Amount, source: String, destination: String): Result<List<Amount>> {
+        when (val result = networkManager.getFee()) {
+            is Result.Failure -> return result
+            is Result.Success -> {
+                val sizeResult = transactionBuilder.getEstimateSize(
+                        TransactionData(amount,
+                                Amount(1.toBigDecimal().divide(SATOSHI_IN_BTC), blockchain),
+                                address, destination),
+                        walletPublicKey
+                )
+                when (sizeResult) {
+                    is Result.Failure -> return sizeResult
+                    is Result.Success -> {
+                        val transactionSize = sizeResult.data.toBigDecimal()
+                        val minFee = result.data.minimalPerKb.calculateFee(transactionSize)
+                        val normalFee = result.data.normalPerKb.calculateFee(transactionSize)
+                        val priorityFee = result.data.priorityPerKb.calculateFee(transactionSize)
+                        return Result.Success(
+                                listOf(Amount(minFee, blockchain),
+                                        Amount(normalFee, blockchain),
+                                        Amount(priorityFee, blockchain))
+                        )
+                    }
+                }
+            }
+        }
+    }
+
+    private fun BigDecimal.calculateFee(transactionSize: BigDecimal): BigDecimal {
+        val bytesInKb = BigDecimal(1024)
+        return this.divide(bytesInKb).multiply(transactionSize)
+                .setScale(8, blockchain.roundingMode())
+    }
+}
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/bitcoin/network/BitcoinNetworkManager.kt b/blockchain/src/main/java/com/tangem/blockchain/bitcoin/network/BitcoinNetworkManager.kt
new file mode 100644
index 0000000000..55b686591e
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/bitcoin/network/BitcoinNetworkManager.kt
@@ -0,0 +1,104 @@
+package com.tangem.blockchain.bitcoin.network
+
+import com.tangem.blockchain.bitcoin.UnspentTransaction
+import com.tangem.blockchain.bitcoin.network.api.BlockchainInfoApi
+import com.tangem.blockchain.bitcoin.network.api.BlockcypherApi
+import com.tangem.blockchain.bitcoin.network.api.EstimatefeeApi
+import com.tangem.blockchain.common.extensions.Result
+import com.tangem.blockchain.common.extensions.SimpleResult
+import com.tangem.blockchain.common.network.API_BLOCKCHAIN_INFO
+import com.tangem.blockchain.common.network.API_BLOCKCYPHER
+import com.tangem.blockchain.common.network.API_ESTIMATEFEE
+import com.tangem.blockchain.common.network.createRetrofitInstance
+import retrofit2.HttpException
+import java.io.IOException
+import java.math.BigDecimal
+
+
+class BitcoinNetworkManager(private val isTestNet: Boolean) : BitcoinProvider {
+
+    private val blockcypherProvider by lazy {
+        val api = createRetrofitInstance(API_BLOCKCYPHER)
+                .create(BlockcypherApi::class.java)
+        BlockcypherProvider(api, isTestNet)
+    }
+
+    private val blockchainInfoProvider by lazy {
+        val api = createRetrofitInstance(API_BLOCKCHAIN_INFO)
+                .create(BlockchainInfoApi::class.java)
+        val estimateFeeApi = createRetrofitInstance(API_ESTIMATEFEE)
+                .create(EstimatefeeApi::class.java)
+        BlockchainInfoProvider(api, estimateFeeApi)
+    }
+
+    private var bitcoinProvider: BitcoinProvider = blockchainInfoProvider
+
+    private fun changeProvider() {
+        bitcoinProvider = if (bitcoinProvider == blockchainInfoProvider) {
+            blockcypherProvider
+        } else {
+            blockchainInfoProvider
+        }
+    }
+
+    override suspend fun getInfo(address: String): Result<BitcoinAddressResponse> {
+        val result = bitcoinProvider.getInfo(address)
+        when (result) {
+            is Result.Success -> return result
+            is Result.Failure -> {
+                if (result.error is IOException || result.error is HttpException) {
+                    changeProvider()
+                    return bitcoinProvider.getInfo(address)
+                } else {
+                    return result
+                }
+            }
+        }
+    }
+
+    override suspend fun getFee(): Result<BitcoinFee> {
+        val result = bitcoinProvider.getFee()
+        when (result) {
+            is Result.Success -> return result
+            is Result.Failure -> {
+                if (result.error is IOException || result.error is HttpException) {
+                    changeProvider()
+                    return bitcoinProvider.getFee()
+                } else {
+                    return result
+                }
+            }
+        }
+    }
+
+    override suspend fun sendTransaction(transaction: String): SimpleResult {
+        val result = bitcoinProvider.sendTransaction(transaction)
+        when (result) {
+            is SimpleResult.Success -> return result
+            is SimpleResult.Failure -> {
+                if (result.error is IOException || result.error is HttpException) {
+                    changeProvider()
+                    return bitcoinProvider.sendTransaction(transaction)
+                } else {
+                    return result
+                }
+            }
+        }
+    }
+
+    companion object {
+        val SATOSHI_IN_BTC = 100000000.toBigDecimal()
+    }
+}
+
+data class BitcoinAddressResponse(
+        val balance: BigDecimal,
+        val hasUnconfirmed: Boolean,
+        val unspentTransactions: List<UnspentTransaction>?
+)
+
+data class BitcoinFee(
+        val minimalPerKb: BigDecimal,
+        val normalPerKb: BigDecimal,
+        val priorityPerKb: BigDecimal
+)
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/bitcoin/network/BitcoinProvider.kt b/blockchain/src/main/java/com/tangem/blockchain/bitcoin/network/BitcoinProvider.kt
new file mode 100644
index 0000000000..e82fb2f67c
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/bitcoin/network/BitcoinProvider.kt
@@ -0,0 +1,10 @@
+package com.tangem.blockchain.bitcoin.network
+
+import com.tangem.blockchain.common.extensions.Result
+import com.tangem.blockchain.common.extensions.SimpleResult
+
+interface BitcoinProvider {
+    suspend fun getInfo(address: String): Result<BitcoinAddressResponse>
+    suspend fun getFee(): Result<BitcoinFee>
+    suspend fun sendTransaction(transaction: String): SimpleResult
+}
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/bitcoin/network/BlockchainInfoProvider.kt b/blockchain/src/main/java/com/tangem/blockchain/bitcoin/network/BlockchainInfoProvider.kt
new file mode 100644
index 0000000000..7b2882ec57
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/bitcoin/network/BlockchainInfoProvider.kt
@@ -0,0 +1,80 @@
+package com.tangem.blockchain.bitcoin.network
+
+import com.tangem.blockchain.bitcoin.UnspentTransaction
+import com.tangem.blockchain.bitcoin.network.BitcoinNetworkManager.Companion.SATOSHI_IN_BTC
+import com.tangem.blockchain.bitcoin.network.api.BlockchainInfoApi
+import com.tangem.blockchain.bitcoin.network.api.EstimatefeeApi
+import com.tangem.blockchain.common.extensions.Result
+import com.tangem.blockchain.common.extensions.SimpleResult
+import com.tangem.blockchain.common.extensions.retryIO
+import com.tangem.common.extensions.hexToBytes
+import kotlinx.coroutines.async
+import kotlinx.coroutines.coroutineScope
+
+
+class BlockchainInfoProvider(
+        private val blockchainApi: BlockchainInfoApi,
+        private val estimatefeeApi: EstimatefeeApi
+) : BitcoinProvider {
+
+    override suspend fun getInfo(address: String): Result<BitcoinAddressResponse> {
+        return try {
+            coroutineScope {
+                val addressDeferred = retryIO { async { blockchainApi.getAddress(address) } }
+                val unspentsDeferred = retryIO { async { blockchainApi.getUnspents(address) } }
+
+                val addressData = addressDeferred.await()
+                val unspents = unspentsDeferred.await()
+                val unconfirmedTransactions = addressData.transactions?.find { it.blockHeight == 0L } != null
+
+                val bitcoinUnspents = unspents.unspentOutputs.map {
+                    UnspentTransaction(
+                            it.amount!!.toBigDecimal().divide(SATOSHI_IN_BTC),
+                            it.outputIndex!!.toLong(),
+                            it.hash!!.hexToBytes(),
+                            it.outputScript!!.hexToBytes())
+                }
+
+                Result.Success(
+                        BitcoinAddressResponse(
+                                addressData.finalBalance?.toBigDecimal()?.divide(SATOSHI_IN_BTC)
+                                        ?: 0.toBigDecimal(), unconfirmedTransactions, bitcoinUnspents))
+            }
+        } catch (exception: Exception) {
+            Result.Failure(exception)
+        }
+    }
+
+    override suspend fun getFee(): Result<BitcoinFee> {
+        return try {
+            coroutineScope {
+                val minFeeDeferred = retryIO { async { estimatefeeApi.getEstimateFeeMinimal() } }
+                val normalFeeDeferred = retryIO { async { estimatefeeApi.getEstimateFeeNormal() } }
+                val priorityFeeDeferred = retryIO { async { estimatefeeApi.getEstimateFeePriority() } }
+
+                val minFee = minFeeDeferred.await()
+                val normalFee = normalFeeDeferred.await()
+                val priorityFee = priorityFeeDeferred.await()
+
+                Result.Success(BitcoinFee(
+                        minFee.toBigDecimal(),
+                        normalFee.toBigDecimal(),
+                        priorityFee.toBigDecimal()))
+            }
+        } catch (exception: Exception) {
+            Result.Failure(exception)
+        }
+    }
+
+
+    override suspend fun sendTransaction(transaction: String): SimpleResult {
+        return try {
+            retryIO { blockchainApi.sendTransaction(transaction) }
+            SimpleResult.Success
+        } catch (exception: Exception) {
+            SimpleResult.Failure(exception)
+        }
+    }
+
+
+}
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/bitcoin/network/BlockcypherProvider.kt b/blockchain/src/main/java/com/tangem/blockchain/bitcoin/network/BlockcypherProvider.kt
new file mode 100644
index 0000000000..94c9e3dd17
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/bitcoin/network/BlockcypherProvider.kt
@@ -0,0 +1,83 @@
+package com.tangem.blockchain.bitcoin.network
+
+import com.tangem.blockchain.bitcoin.UnspentTransaction
+import com.tangem.blockchain.bitcoin.network.BitcoinNetworkManager.Companion.SATOSHI_IN_BTC
+import com.tangem.blockchain.bitcoin.network.api.BlockcypherApi
+import com.tangem.blockchain.bitcoin.network.api.BlockcypherBody
+import com.tangem.blockchain.bitcoin.network.response.BlockcypherFee
+import com.tangem.blockchain.bitcoin.network.response.BlockcypherResponse
+import com.tangem.blockchain.common.extensions.Result
+import com.tangem.blockchain.common.extensions.SimpleResult
+import com.tangem.blockchain.common.extensions.retryIO
+import com.tangem.common.extensions.hexToBytes
+
+class BlockcypherProvider(private val api: BlockcypherApi, isTestNet: Boolean) : BitcoinProvider {
+
+    private val blockchain = "btc"
+
+    private val network = if (isTestNet) {
+        BlockcypherNetwork.Test.network
+    } else {
+        BlockcypherNetwork.Main.network
+    }
+
+    override suspend fun getInfo(address: String): Result<BitcoinAddressResponse> {
+        try {
+            val addressData: BlockcypherResponse = retryIO { api.getAddressData(blockchain, network, address) }
+            val unspents = addressData.txrefs?.map {
+                UnspentTransaction(
+                        it.amount!!.toBigDecimal().divide(SATOSHI_IN_BTC),
+                        it.outputIndex!!.toLong(),
+                        it.hash!!.hexToBytes(),
+                        it.outputScript!!.hexToBytes()
+                )
+            }
+            return Result.Success(BitcoinAddressResponse(
+                    addressData.balance!!.toBigDecimal().divide(SATOSHI_IN_BTC),
+                    addressData.unconfirmedBalance != 0L,
+                    unspents))
+
+        } catch (error: Exception) {
+            return Result.Failure(error)
+        }
+    }
+
+    override suspend fun getFee(): Result<BitcoinFee> {
+        try {
+            val receivedFee: BlockcypherFee = retryIO { api.getFee(blockchain, network) }
+            return Result.Success(
+                    BitcoinFee(receivedFee.minFeePerKb!!.toBigDecimal().divide(SATOSHI_IN_BTC),
+                            receivedFee.normalFeePerKb!!.toBigDecimal().divide(SATOSHI_IN_BTC),
+                            receivedFee.priorityFeePerKb!!.toBigDecimal().divide(SATOSHI_IN_BTC))
+            )
+        } catch (error: Exception) {
+            return Result.Failure(error)
+        }
+    }
+
+    override suspend fun sendTransaction(transaction: String): SimpleResult {
+        try {
+            retryIO {
+                api.sendTransaction(
+                        blockchain, network, BlockcypherBody(transaction), BlockcypherToken.getToken())
+            }
+            return SimpleResult.Success
+        } catch (error: Exception) {
+            return SimpleResult.Failure(error)
+        }
+    }
+}
+
+private object BlockcypherToken {
+    private val tokens = listOf(
+            "aa8184b0e0894b88a5688e01b3dc1e82",
+            "56c4ca23c6484c8f8864c32fde4def8d",
+            "66a8a37c5e9d4d2c9bb191acfe7f93aa")
+
+    fun getToken(): String = tokens.random()
+}
+
+private enum class BlockcypherNetwork(val network: String) {
+    Main("main"),
+    Test("test3")
+}
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/bitcoin/network/api/BlockchainInfoApi.kt b/blockchain/src/main/java/com/tangem/blockchain/bitcoin/network/api/BlockchainInfoApi.kt
new file mode 100644
index 0000000000..1b43631d5a
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/bitcoin/network/api/BlockchainInfoApi.kt
@@ -0,0 +1,18 @@
+package com.tangem.blockchain.bitcoin.network.api
+
+import com.tangem.blockchain.bitcoin.network.response.BlockchainInfoAddress
+import com.tangem.blockchain.bitcoin.network.response.BlockchainInfoUnspents
+import okhttp3.ResponseBody
+import retrofit2.http.*
+
+interface BlockchainInfoApi {
+    @GET("rawaddr/{address}?limit=5")
+    suspend fun getAddress(@Path("address") address: String): BlockchainInfoAddress
+
+    @GET("unspent")
+    suspend fun getUnspents(@Query("active") address: String): BlockchainInfoUnspents
+
+    @FormUrlEncoded
+    @POST("pushtx")
+    suspend fun sendTransaction(@Field("tx") transaction: String): ResponseBody
+}
diff --git a/blockchain/src/main/java/com/tangem/blockchain/bitcoin/network/api/BlockcypherApi.kt b/blockchain/src/main/java/com/tangem/blockchain/bitcoin/network/api/BlockcypherApi.kt
new file mode 100644
index 0000000000..755191e81e
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/bitcoin/network/api/BlockcypherApi.kt
@@ -0,0 +1,41 @@
+package com.tangem.blockchain.bitcoin.network.api
+
+import com.squareup.moshi.JsonClass
+import com.tangem.blockchain.bitcoin.network.response.BlockcypherFee
+import com.tangem.blockchain.bitcoin.network.response.BlockcypherResponse
+import com.tangem.blockchain.bitcoin.network.response.BlockcypherTx
+import retrofit2.http.*
+
+interface BlockcypherApi {
+    @GET("v1/{blockchain}/{network}")
+    suspend fun getFee(
+            @Path("blockchain") blockchain: String,
+            @Path("network") network: String
+    ): BlockcypherFee
+
+    @GET("v1/{blockchain}/{network}/addrs/{address}?unspentOnly=true&includeScript=true")
+    suspend fun getAddressData(
+            @Path("blockchain") blockchain: String,
+            @Path("network") network: String,
+            @Path("address") address: String
+    ): BlockcypherResponse
+
+    @GET("v1/{blockchain}/{network}/txs/{txHash}?includeHex=true")
+    suspend fun getTransactions(
+            @Path("blockchain") blockchain: String,
+            @Path("network") network: String,
+            @Path("txHash") txHash: String
+    ): BlockcypherTx
+
+    @Headers("Content-Type: application/json")
+    @POST("v1/{blockchain}/{network}/txs/push")
+    suspend fun sendTransaction(
+            @Path("blockchain") blockchain: String,
+            @Path("network") network: String,
+            @Body blockcypherBody: BlockcypherBody,
+            @Query("token") token: String
+    ): BlockcypherTx
+}
+
+@JsonClass(generateAdapter = true)
+data class BlockcypherBody(val tx: String)
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/bitcoin/network/api/EstimateFeeApi.kt b/blockchain/src/main/java/com/tangem/blockchain/bitcoin/network/api/EstimateFeeApi.kt
new file mode 100644
index 0000000000..22e95304db
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/bitcoin/network/api/EstimateFeeApi.kt
@@ -0,0 +1,16 @@
+package com.tangem.blockchain.bitcoin.network.api
+
+import retrofit2.http.GET
+
+interface EstimatefeeApi {
+    @GET(ESTIMATE_FEE_URL + "n/2")
+    suspend fun getEstimateFeePriority(): String
+
+    @GET(ESTIMATE_FEE_URL + "n/3")
+    suspend fun getEstimateFeeNormal(): String
+
+    @GET(ESTIMATE_FEE_URL + "n/6")
+    suspend fun getEstimateFeeMinimal(): String
+}
+
+const val ESTIMATE_FEE_URL = "https://estimatefee.com/"
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/bitcoin/network/response/BlockchainInfoResponse.kt b/blockchain/src/main/java/com/tangem/blockchain/bitcoin/network/response/BlockchainInfoResponse.kt
new file mode 100644
index 0000000000..015d867985
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/bitcoin/network/response/BlockchainInfoResponse.kt
@@ -0,0 +1,43 @@
+package com.tangem.blockchain.bitcoin.network.response
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class BlockchainInfoAddress(
+        @Json(name = "final_balance")
+        val finalBalance: Long? = null,
+
+        @Json(name = "txs")
+        val transactions: List<BlockchainInfoTransaction>? = null
+)
+
+@JsonClass(generateAdapter = true)
+data class BlockchainInfoTransaction(
+        @Json(name = "hash")
+        val hash: String? = null,
+
+        @Json(name = "block_height")
+        val blockHeight: Long? = null
+)
+
+@JsonClass(generateAdapter = true)
+data class BlockchainInfoUnspents(
+        @Json(name = "unspent_outputs")
+        val unspentOutputs: List<BlockchainInfoUtxo>
+)
+
+@JsonClass(generateAdapter = true)
+data class BlockchainInfoUtxo(
+        @Json(name = "tx_hash_big_endian")
+        val hash: String? = null,
+
+        @Json(name = "tx_output_n")
+        val outputIndex: Int? = null,
+
+        @Json(name = "value")
+        val amount: Long? = null,
+
+        @Json(name = "script")
+        val outputScript: String? = null
+)
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/bitcoin/network/response/BlockcypherResponse.kt b/blockchain/src/main/java/com/tangem/blockchain/bitcoin/network/response/BlockcypherResponse.kt
new file mode 100644
index 0000000000..b1e869797a
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/bitcoin/network/response/BlockcypherResponse.kt
@@ -0,0 +1,55 @@
+package com.tangem.blockchain.bitcoin.network.response
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class BlockcypherResponse(
+        @Json(name = "address")
+        val address: String? = null,
+
+        @Json(name = "balance")
+        val balance: Long? = null,
+
+        @Json(name = "unconfirmed_balance")
+        val unconfirmedBalance: Long? = null,
+
+        @Json(name = "txrefs")
+        val txrefs: List<BlockcypherTxref>? = null
+)
+
+@JsonClass(generateAdapter = true)
+data class BlockcypherTxref(
+        @Json(name = "tx_hash")
+        val hash: String? = null,
+
+        @Json(name = "tx_output_n")
+        val outputIndex: Int? = null,
+
+        @Json(name = "value")
+        val amount: Long? = null,
+
+        @Json(name = "confirmations")
+        val confirmations: Long? = null,
+
+        @Json(name = "script")
+        val outputScript: String? = null
+)
+
+@JsonClass(generateAdapter = true)
+data class BlockcypherTx(
+        @Json(name = "hex")
+        val hex: String? = null
+)
+
+@JsonClass(generateAdapter = true)
+data class BlockcypherFee(
+        @Json(name = "low_fee_per_kb")
+        val minFeePerKb: Long? = null,
+
+        @Json(name = "medium_fee_per_kb")
+        val normalFeePerKb: Long? = null,
+
+        @Json(name = "high_fee_per_kb")
+        val priorityFeePerKb: Long? = null
+)
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/cardano/CardanoAddress.kt b/blockchain/src/main/java/com/tangem/blockchain/cardano/CardanoAddress.kt
new file mode 100644
index 0000000000..3aecd18ff1
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/cardano/CardanoAddress.kt
@@ -0,0 +1,105 @@
+package com.tangem.blockchain.cardano
+
+import co.nstant.`in`.cbor.CborBuilder
+import co.nstant.`in`.cbor.CborDecoder
+import co.nstant.`in`.cbor.CborEncoder
+import co.nstant.`in`.cbor.model.Array
+import co.nstant.`in`.cbor.model.ByteString
+import co.nstant.`in`.cbor.model.UnsignedInteger
+import com.tangem.blockchain.cardano.crypto.Blake2b
+import com.tangem.blockchain.common.extensions.decodeBase58
+import com.tangem.blockchain.common.extensions.encodeBase58
+import org.spongycastle.crypto.util.DigestFactory
+import java.io.ByteArrayInputStream
+import java.io.ByteArrayOutputStream
+import java.util.zip.CRC32
+
+class CardanoAddressFactory {
+    companion object {
+        fun makeAddress(cardPublicKey: ByteArray, testNet: Boolean = false): String {
+            val extendedPublicKey = extendPublicKey(cardPublicKey)
+
+            val pubKeyWithAttributesBaos = ByteArrayOutputStream()
+            CborEncoder(pubKeyWithAttributesBaos).encode(CborBuilder()
+                    .addArray()
+                        .add(0)
+                            .addArray()
+                                .add(0)
+                                .add(extendedPublicKey)
+                            .end()
+                        .addMap()
+                        .end()
+                    .end()
+                    .build())
+            val pubKeyWithAttributes = pubKeyWithAttributesBaos.toByteArray()
+
+            val sha3Digest = DigestFactory.createSHA3_256()
+            sha3Digest.update(pubKeyWithAttributes, 0, pubKeyWithAttributes.size)
+            val sha3Hash = ByteArray(32)
+            sha3Digest.doFinal(sha3Hash, 0)
+
+            val blake2b = Blake2b.Digest.newInstance(28)
+            val blakeHash = blake2b.digest(sha3Hash)
+
+            val hashWithAttributesBaos = ByteArrayOutputStream()
+            CborEncoder(hashWithAttributesBaos).encode(CborBuilder()
+                    .addArray()
+                        .add(blakeHash)
+                        .addMap() //additional attributes
+                        .end()
+                        .add(0) //address type
+                    .end()
+                    .build())
+            val hashWithAttributes = hashWithAttributesBaos.toByteArray()
+
+            val crc32 = CRC32()
+            crc32.update(hashWithAttributes)
+            val checksum = crc32.value
+
+            val addressItem = CborBuilder().add(hashWithAttributes).build().get(0)
+            addressItem.setTag(24)
+
+            //addr + checksum
+            val addressBaos = ByteArrayOutputStream()
+            CborEncoder(addressBaos).encode(CborBuilder()
+                    .addArray()
+                        .add(addressItem)
+                        .add(checksum)
+                    .end()
+                    .build())
+
+            val hexAddress = addressBaos.toByteArray()
+            return hexAddress.encodeBase58()
+        }
+
+        fun extendPublicKey(publicKey: ByteArray): ByteArray {
+            val zeroBytes = ByteArray(32)
+            zeroBytes.fill(0)
+            return publicKey + zeroBytes
+        }
+    }
+}
+
+class CardanoAddressValidator {
+    companion object {
+        fun validate(address: String): Boolean {
+            val decoded = address.decodeBase58() ?: return false
+
+            return try {
+                val bais = ByteArrayInputStream(decoded)
+                val addressList =
+                        (CborDecoder(bais).decode()[0] as Array).dataItems
+                val addressItemBytes = (addressList[0] as ByteString).bytes
+                val checksum = (addressList[1] as UnsignedInteger).value.toLong()
+
+                val crc32 = CRC32()
+                crc32.update(addressItemBytes)
+                val calculatedChecksum = crc32.value
+
+                checksum == calculatedChecksum
+            } catch (e: Exception) {
+                false
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/cardano/CardanoTransactionBuilder.kt b/blockchain/src/main/java/com/tangem/blockchain/cardano/CardanoTransactionBuilder.kt
new file mode 100644
index 0000000000..a251e0068c
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/cardano/CardanoTransactionBuilder.kt
@@ -0,0 +1,171 @@
+package com.tangem.blockchain.cardano
+
+import co.nstant.`in`.cbor.CborBuilder
+import co.nstant.`in`.cbor.CborDecoder
+import co.nstant.`in`.cbor.CborEncoder
+import co.nstant.`in`.cbor.builder.ArrayBuilder
+import com.tangem.blockchain.cardano.crypto.Blake2b
+import com.tangem.blockchain.common.TransactionData
+import com.tangem.blockchain.common.extensions.decodeBase58
+import java.io.ByteArrayInputStream
+import java.io.ByteArrayOutputStream
+import java.math.BigDecimal
+
+class CardanoTransactionBuilder() {
+    var unspentOutputs: List<UnspentOutput> = listOf()
+    var transactionBody: ByteArray = ByteArray(0)
+
+    fun buildToSign(transactionData: TransactionData): ByteArray {
+        val transactionBuilder = CborBuilder()
+
+        val transactionArray = transactionBuilder.addArray()
+        transactionArray.addInputArray()
+        transactionArray.addOutputArray(transactionData)
+        transactionArray.addMap().end()
+
+        val transactionBaos = ByteArrayOutputStream()
+        CborEncoder(transactionBaos).encode(transactionBuilder.build())
+        transactionBody = transactionBaos.toByteArray()
+
+        val blake2b = Blake2b.Digest.newInstance(32)
+        val transactionBodyHash = blake2b.digest(transactionBody)
+
+        val magicBaos = ByteArrayOutputStream()
+        CborEncoder(magicBaos).encode(CborBuilder().add(PROTOCOL_MAGIC).build())
+        val magic = magicBaos.toByteArray()
+
+        //dataToSign prefix
+        val prefixedHashBaos = ByteArrayOutputStream()
+        prefixedHashBaos.write(byteArrayOf(0x01.toByte()))
+        prefixedHashBaos.write(magic)
+        prefixedHashBaos.write(byteArrayOf(0x58.toByte(), 0x20.toByte()))
+        prefixedHashBaos.write(transactionBodyHash)
+        return prefixedHashBaos.toByteArray()
+    }
+
+    fun buildToSend(signature: ByteArray, publicKey: ByteArray): ByteArray {
+        val extendedPublicKey = CardanoAddressFactory.extendPublicKey(publicKey)
+
+        //pubkey + signature
+        val witnessBodyBaos = ByteArrayOutputStream()
+        CborEncoder(witnessBodyBaos).encode(CborBuilder()
+                .addArray()
+                    .add(extendedPublicKey)
+                    .add(signature)
+                .end()
+                .build())
+        val witnessBody = witnessBodyBaos.toByteArray()
+        val witnessBodyItem = CborBuilder().add(witnessBody).build()[0]
+        witnessBodyItem.setTag(24)
+
+        val witnessBuilder = CborBuilder()
+        val witnessArrayBuilder = witnessBuilder.addArray()
+
+        //witness type + witness body
+        for (utxo in unspentOutputs) {
+            witnessArrayBuilder
+                    .addArray()
+                        .add(0)
+                        .add(witnessBodyItem)
+                    .end()
+        }
+
+        val witnessBaos = ByteArrayOutputStream()
+        CborEncoder(witnessBaos).encode(witnessBuilder.build())
+        val witness = witnessBaos.toByteArray()
+
+        val transactionBaos = ByteArrayOutputStream()
+        transactionBaos.write(byteArrayOf(0x82.toByte()))
+        transactionBaos.write(transactionBody)
+        transactionBaos.write(witness)
+        return transactionBaos.toByteArray()
+    }
+
+    private fun ArrayBuilder<CborBuilder>.addInputArray() {
+        val inputArray = this.startArray()
+
+        for (utxo in unspentOutputs) {
+            val inputBaos = ByteArrayOutputStream()
+            CborEncoder(inputBaos).encode(CborBuilder()
+                    .addArray()
+                        .add(utxo.hash)
+                        .add(utxo.outputIndex)
+                    .end()
+                    .build())
+            val input = inputBaos.toByteArray()
+
+            val inputItem = CborBuilder().add(input).build().get(0)
+            inputItem.setTag(24)
+            //input type + input
+            inputArray
+                    .addArray()
+                        .add(0)
+                        .add(inputItem)
+                    .end()
+        }
+        inputArray.end()
+    }
+
+    private fun ArrayBuilder<CborBuilder>.addOutputArray(transactionData: TransactionData) {
+        val amount = transactionData.amount.value!!
+                .movePointRight(transactionData.amount.decimals.toInt()).toLong()
+        val fee = transactionData.fee!!.value!!
+                .movePointRight(transactionData.fee.decimals.toInt()).toLong()
+        val change = calculateChange(amount, fee)
+
+        val outputArray = this.startArray()
+
+        //1st output
+        val targetAddressItem =
+                CborDecoder(ByteArrayInputStream(transactionData.destinationAddress.decodeBase58()))
+                        .decode()[0]
+        outputArray
+                .addArray()
+                    .add(targetAddressItem)
+                    .add(amount)
+                .end()
+
+        //2nd output (optional)
+        if (change > 0) {
+            val myAddressItem =
+                    CborDecoder(ByteArrayInputStream(transactionData.sourceAddress.decodeBase58()))
+                            .decode()[0]
+            outputArray
+                    .addArray()
+                        .add(myAddressItem)
+                        .add(change)
+                    .end()
+        }
+        outputArray.end()
+    }
+
+    private fun calculateChange(amount: Long, fee: Long): Long {
+        val fullAmount = unspentOutputs.map { it.amount }.sum()
+        return fullAmount - (amount + fee)
+    }
+
+    fun getEstimateSize(transactionData: TransactionData, walletPublicKey: ByteArray): Int {
+        val dummyFeeValue = BigDecimal.valueOf(0.1)
+
+        val dummyFee = transactionData.amount.copy(value = dummyFeeValue)
+        val dummyAmount =
+                transactionData.amount.copy(value = transactionData.amount.value!! - dummyFeeValue)
+
+        val dummyTransactionData = transactionData.copy(
+                amount = dummyAmount,
+                fee = dummyFee
+        )
+        buildToSign(dummyTransactionData)
+        return buildToSend(ByteArray(64), walletPublicKey).size
+    }
+
+    companion object {
+        private const val PROTOCOL_MAGIC: Long = 764824073
+    }
+}
+
+class UnspentOutput(
+        val amount: Long,
+        val outputIndex: Long,
+        val hash: ByteArray
+)
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/cardano/CardanoWalletManager.kt b/blockchain/src/main/java/com/tangem/blockchain/cardano/CardanoWalletManager.kt
new file mode 100644
index 0000000000..e5c7b71a70
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/cardano/CardanoWalletManager.kt
@@ -0,0 +1,70 @@
+package com.tangem.blockchain.cardano
+
+import android.util.Base64
+import android.util.Log
+import com.tangem.blockchain.cardano.network.CardanoAddressResponse
+import com.tangem.blockchain.cardano.network.CardanoNetworkManager
+import com.tangem.blockchain.common.*
+import com.tangem.blockchain.common.extensions.Result
+import com.tangem.blockchain.common.extensions.SimpleResult
+import com.tangem.blockchain.common.extensions.encodeBase64NoWrap
+import com.tangem.blockchain.wallets.CurrencyWallet
+import com.tangem.tasks.TaskEvent
+import java.math.BigDecimal
+
+class CardanoWalletManager(
+        private val cardId: String,
+        private val walletPublicKey: ByteArray,
+        walletConfig: WalletConfig
+) : WalletManager,
+        TransactionSender,
+        FeeProvider {
+
+    override val blockchain = Blockchain.Cardano
+    private val address = blockchain.makeAddress(walletPublicKey)
+    private val currencyWallet = CurrencyWallet(walletConfig, address)
+    override var wallet: Wallet = currencyWallet
+    private val transactionBuilder = CardanoTransactionBuilder()
+    private val networkManager = CardanoNetworkManager()
+
+    override suspend fun update() {
+        val response = networkManager.getInfo(address)
+        when (response) {
+            is Result.Success -> updateWallet(response.data)
+            is Result.Failure -> updateError(response.error)
+        }
+    }
+
+    private fun updateWallet(response: CardanoAddressResponse) {
+        Log.d(this::class.java.simpleName, "Balance is ${response.balance.toString()}")
+        currencyWallet.balances[AmountType.Coin]?.value =
+                response.balance.toBigDecimal().movePointLeft(blockchain.decimals.toInt())
+        transactionBuilder.unspentOutputs = response.unspentOutputs
+    }
+
+    private fun updateError(error: Throwable?) {
+        Log.e(this::class.java.simpleName, error?.message ?: "")
+    }
+
+    override suspend fun send(transactionData: TransactionData, signer: TransactionSigner): SimpleResult {
+        val transactionHash = transactionBuilder.buildToSign(transactionData)
+
+        when (val signerResponse = signer.sign(arrayOf(transactionHash), cardId)) {
+            is TaskEvent.Event -> {
+                val transactionToSend = transactionBuilder.buildToSend(signerResponse.data.signature, walletPublicKey)
+                return networkManager.sendTransaction(transactionToSend.encodeBase64NoWrap())
+            }
+            is TaskEvent.Completion -> return SimpleResult.Failure(signerResponse.error)
+        }
+    }
+
+    override suspend fun getFee(amount: Amount, source: String, destination: String): Result<List<Amount>> {
+        val a = 0.155381
+        val b = 0.000043946
+        val size = transactionBuilder.getEstimateSize(
+                TransactionData(amount, null, source, destination), walletPublicKey
+        )
+        val fee = (a + b * size).toBigDecimal()
+        return Result.Success(listOf(Amount(blockchain.currency, fee, source, blockchain.decimals)))
+    }
+}
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/cardano/crypto/Blake2b.java b/blockchain/src/main/java/com/tangem/blockchain/cardano/crypto/Blake2b.java
new file mode 100644
index 0000000000..01358597fd
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/cardano/crypto/Blake2b.java
@@ -0,0 +1,2097 @@
+/* !!! Doost !!! */
+
+/*
+   A Java implementation of BLAKE2B cryptographic digest algorithm.
+
+   Joubin Mohammad Houshyar <alphazero@sensesay.net>
+   bushwick, nyc
+   02-14-2014
+
+   --
+
+   To the extent possible under law, the author(s) have dedicated all copyright
+   and related and neighboring rights to this software to the public domain
+   worldwide. This software is distributed without any warranty.
+
+   You should have received a copy of the CC0 Public Domain Dedication along with
+   this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+*/
+
+package com.tangem.blockchain.cardano.crypto;
+
+import java.io.PrintStream;
+import java.io.Serializable;
+import java.security.Key;
+import java.security.spec.AlgorithmParameterSpec;
+import java.util.Arrays;
+
+import static com.tangem.blockchain.cardano.crypto.Blake2b.Engine.Assert.assertFail;
+import static com.tangem.blockchain.cardano.crypto.Blake2b.Engine.Assert.exclusiveLowerBound;
+import static com.tangem.blockchain.cardano.crypto.Blake2b.Engine.Assert.inclusiveLowerBound;
+import static com.tangem.blockchain.cardano.crypto.Blake2b.Engine.Assert.inclusiveUpperBound;
+import static com.tangem.blockchain.cardano.crypto.Blake2b.Engine.LittleEndian.readInt;
+import static com.tangem.blockchain.cardano.crypto.Blake2b.Engine.LittleEndian.readLong;
+import static com.tangem.blockchain.cardano.crypto.Blake2b.Engine.LittleEndian.writeInt;
+import static com.tangem.blockchain.cardano.crypto.Blake2b.Engine.LittleEndian.writeLong;
+
+
+/**  */
+public interface Blake2b {
+	// ---------------------------------------------------------------------
+	// Specification
+	// ---------------------------------------------------------------------
+	public interface Spec {
+		/** pblock size of blake2b */
+		int param_bytes 		= 64;
+
+		/** pblock size of blake2b */
+		int block_bytes 		= 128;
+
+		/** maximum digest size */
+		int max_digest_bytes 	= 64;
+
+		/** maximum key sie */
+		int max_key_bytes 		= 64;
+
+		/** maximum salt size */
+		int max_salt_bytes 		= 16;
+
+		/** maximum personalization string size */
+		int max_personalization_bytes = 16;
+
+		/** length of h space vector array */
+		int state_space_len 		= 8;
+
+		/** max tree fanout value */
+		int max_tree_fantout 		= 0xFF;
+
+		/** max tree depth value */
+		int max_tree_depth 			= 0xFF;
+
+		/** max tree leaf length value.Note that this has uint32 semantics
+		 and thus 0xFFFFFFFF is used as max value limit. */
+		int max_tree_leaf_length 	= 0xFFFFFFFF;
+
+		/** max node offset value. Note that this has uint64 semantics
+		 and thus 0xFFFFFFFFFFFFFFFFL is used as max value limit. */
+		long max_node_offset 		= 0xFFFFFFFFFFFFFFFFL;
+
+		/** max tree inner length value */
+		int max_tree_inner_length 	= 0xFF;
+
+		/** initialization values map ref-Spec IV[i] -> slice iv[i*8:i*8+7] */
+		long[] IV = {
+				0x6a09e667f3bcc908L,
+				0xbb67ae8584caa73bL,
+				0x3c6ef372fe94f82bL,
+				0xa54ff53a5f1d36f1L,
+				0x510e527fade682d1L,
+				0x9b05688c2b3e6c1fL,
+				0x1f83d9abfb41bd6bL,
+				0x5be0cd19137e2179L
+		};
+	}
+
+	// ---------------------------------------------------------------------
+	// API
+	// ---------------------------------------------------------------------
+	// TODO add ByteBuffer variants
+
+	/**
+	 * A serializable / JSON-izable object usable for pausing a hash-in-process
+	 * which can then be resumed with the same Parameter the original digest
+	 * was constructed with, and fed additional bytes to conclude the hash.
+	 */
+	public static final class ResumeHandle implements Serializable {
+		/** per spec */
+		public   long[]  h = new long [ 8 ];
+		/** per spec */
+		public   long[]  t = new long [ 2 ];
+		/** per spec */
+		public   long[]  f = new long [ 2 ];
+		/** per spec (tree) */
+		public         boolean last_node 	= false;
+		/** pulled up 2b optimal */
+		public   long[]  m = new long [16];
+		/** pulled up 2b optimal */
+		public   long[]  v = new long [16];
+
+		/** compressor cache buffer */
+		public   byte[]  buffer;
+		/** compressor cache buffer offset/cached data length */
+		public         int buflen;
+
+		/** digest length from init param - copied here on init */
+		public   int outlen;
+
+		public int type;
+
+		/**
+		 * Create a reconstituted Black2b digest from
+		 *
+		 * @param param
+		 * @return
+		 */
+		public Blake2b resume(Param param) {
+			assert this.buffer != null && this.buffer.length == Spec.block_bytes;
+			assert this.h != null && this.h.length == 8
+					&& this.t != null && this.t.length == 2
+					&& this.f != null && this.f.length == 2
+					&& this.m != null && this.m.length == 16
+					&& this.v != null && this.v.length == 16 : "Data is corrupted";
+			assert this.outlen == param.getDigestLength() : "Not originally initialized from this param";
+			assert this.type == 1 || this.type == 2 : "Unknown type " + this.type;
+			Engine.State state = new Engine.State(outlen, this.type == 1);
+			System.arraycopy(this.h, 0, state.h, 0, state.h.length);
+			System.arraycopy(this.t, 0, state.t, 0, state.t.length);
+			System.arraycopy(this.f, 0, state.f, 0, state.f.length);
+			System.arraycopy(this.m, 0, m, 0, m.length);
+			System.arraycopy(this.v, 0, v, 0, v.length);
+			System.arraycopy(this.buffer, 0, state.buffer, 0, state.buffer.length);
+			state.buflen = buflen;
+			return type == 1 ?  new Mac(param, state) : new Digest(param, state);
+		}
+	}
+
+	/** */
+	void update(byte[] input) ;
+
+	/** */
+	void update(byte input) ;
+
+	/** */
+	void update(byte[] input, int offset, int len) ;
+
+	/** */
+	byte[] digest() ;
+
+	/** */
+	byte[] digest(byte[] input) ;
+
+	/** */
+	void digest(byte[] output, int offset, int len) ;
+
+	/** */
+	void reset() ;
+
+	ResumeHandle state();
+	// ---------------------------------------------------------------------
+	// Blake2b Message Digest
+	// ---------------------------------------------------------------------
+
+	/** Generalized Blake2b digest. */
+	public static class Digest extends Engine implements Blake2b {
+		private Digest (final Param p) { super (p); }
+		private Digest () { super (); }
+		private Digest(Param p, State state) {
+			super(state, p);
+		}
+
+		public static Digest newInstance () {
+			return new Digest ();
+		}
+		public static Digest newInstance (final int digestLength) {
+			return new Digest (new Param().setDigestLength(digestLength));
+		}
+		public static Digest newInstance (Param p) {
+			return new Digest (p);
+		}
+		public static Digest newInstance (Param p, State state) {
+			return new Digest(p, state);
+		}
+	}
+
+	// ---------------------------------------------------------------------
+	// Blake2b Message Authentication Code
+	// ---------------------------------------------------------------------
+
+	/** Message Authentication Code (MAC) digest. */
+	public static class Mac extends Engine implements Blake2b {
+		private Mac (final Param p, State state) { super (state, p); }
+		private Mac (final Param p) { super (p); }
+		private Mac () { super (); }
+
+		/** Blake2b.MAC 512 - using default Blake2b.Spec settings with given key */
+		public static Mac newInstance (final byte[] key) {
+			return new Mac (new Param().setKey(key));
+		}
+		/** Blake2b.MAC - using default Blake2b.Spec settings with given key, with given digest length */
+		public static Mac newInstance (final byte[] key, final int digestLength) {
+			return new Mac (new Param().setKey(key).setDigestLength(digestLength));
+		}
+		/** Blake2b.MAC - using default Blake2b.Spec settings with given java.security.Key, with given digest length */
+		public static Mac newInstance (final Key key, final int digestLength) {
+			return new Mac (new Param().setKey(key).setDigestLength(digestLength));
+		}
+		/** Blake2b.MAC - using the specified Parameters.
+		 * @param p asserted valid configured Param with key */
+		public static Mac newInstance (Param p) {
+			assert p != null : "Param (p) is null";
+			assert p.hasKey() : "Param (p) not configured with a key";
+			return new Mac (p);
+		}
+	}
+
+	// ---------------------------------------------------------------------
+	// Blake2b Incremental Message Digest (Tree)
+	// ---------------------------------------------------------------------
+
+	/**
+	 *  Note that Tree is just a convenience class; incremental hash (tree)
+	 *  can be done directly with the Digest class.
+	 *  <br>
+	 *  Further node, that tree does NOT accumulate the leaf hashes --
+	 *  you need to do that
+	 */
+	public static class Tree {
+
+		final int     depth;
+		final int     fanout;
+		final int     leaf_length;
+		final int     inner_length;
+		final int     digest_length;
+
+		/**
+		 *
+		 * @param fanout
+		 * @param depth
+		 * @param leaf_length size of data input for leaf nodes.
+		 * @param inner_length note this is used also as digest-length for non-root nodes.
+		 * @param digest_length final hash out digest-length for the tree
+		 */
+		public Tree  (
+				final int     depth,
+				final int     fanout,
+				final int     leaf_length,
+				final int     inner_length,
+				final int     digest_length
+		) {
+			this.fanout = fanout;
+			this.depth = depth;
+			this.leaf_length = leaf_length;
+			this.inner_length = inner_length;
+			this.digest_length = digest_length;
+		}
+		private Param treeParam() {
+			return new Param().
+					setDepth(depth).setFanout(fanout).setLeafLength(leaf_length).setInnerLength(inner_length);
+		}
+		/** returns the Digest for tree node @ (depth, offset) */
+		public final Digest getNode (final int depth, final int offset) {
+			final Param nodeParam = treeParam().setNodeDepth(depth).setNodeOffset(offset).setDigestLength(inner_length);
+			return Digest.newInstance(nodeParam);
+		}
+		/** returns the Digest for root node */
+		public final Digest getRoot () {
+			final int depth = this.depth - 1;
+			final Param rootParam = treeParam().setNodeDepth(depth).setNodeOffset(0L).setDigestLength(digest_length);
+			return Digest.newInstance(rootParam);
+		}
+	}
+
+	// ---------------------------------------------------------------------
+	// Engine
+	// ---------------------------------------------------------------------
+	static class Engine implements Blake2b {
+
+		// ---------------------------------------------------------------------
+		// Blake2b State(+) per reference implementation
+		// ---------------------------------------------------------------------
+		// REVU: address last_node TODO part of the Tree/incremental
+		static final class State {
+			/** per spec */
+			private final   long[]  h = new long [ 8 ];
+			/** per spec */
+			private final   long[]  t = new long [ 2 ];
+			/** per spec */
+			private final   long[]  f = new long [ 2 ];
+			/** per spec (tree) */
+			private         boolean last_node 	= false;
+			/** pulled up 2b optimal */
+			private final   long[]  m = new long [16];
+			/** pulled up 2b optimal */
+			private final   long[]  v = new long [16];
+
+			/** compressor cache buffer */
+			private final   byte[]  buffer;
+			/** compressor cache buffer offset/cached data length */
+			private         int buflen;
+
+			/** digest length from init param - copied here on init */
+			private final   int outlen;
+
+			private final int digestType;
+
+			State(int digestLength, boolean isMac) {
+				this.buffer = new byte [ Spec.block_bytes ];
+				this.outlen = digestLength;
+				// do not use zero, so we can detect serialization errors
+				this.digestType = isMac ? 1 : 2;
+			}
+
+			public ResumeHandle toResumableForm() {
+				ResumeHandle state = new ResumeHandle();
+				state.h = h;
+				state.t = t;
+				state.f = f;
+				state.last_node = last_node;
+				state.m = m;
+				state.v = v;
+				state.buffer = buffer;
+				state.buflen = buflen;
+				state.outlen = outlen;
+				state.type = digestType;
+				return state;
+			}
+		}
+
+		private State state;
+		/** configuration params */
+		private final   Param param;
+
+		/** read only */
+		private static byte[] zeropad = new byte [ Spec.block_bytes ];
+
+		/** a little bit of semantics */
+		interface flag {
+			int last_block 	= 0;
+			int last_node 	= 1;
+		}
+		/** to support update(byte) */
+		private final	byte[] oneByte = new byte[1];
+
+		// ---------------------------------------------------------------------
+		// Ctor & Initialization
+		// ---------------------------------------------------------------------
+
+		/** Basic use constructor pending (TODO) JCA/JCE compliance */
+		Engine () {
+			this( new Param() );
+		}
+
+		Engine(State state, Param param) {
+			assert state != null : "state is null";
+			assert param != null : "param is null";
+			this.state = state;
+			this.param = param;
+		}
+
+		/** User provided Param for custom configurations */
+		Engine (final Param param) {
+			assert param != null : "param is null";
+			this.param = param;
+			state  = new State(param.getDigestLength(), this instanceof Mac);
+			if ( param.getDepth() > Param.Default.depth ) {
+				final int ndepth = param.getNodeDepth();
+				final long nxoff = param.getNodeOffset();
+				if (ndepth == param.getDepth() - 1) {
+					state.last_node = true;
+					assert nxoff == 0 : "root must have offset of zero";
+				} else if ( nxoff == param.getFanout() - 1) {
+					this.state.last_node = true;
+				}
+			}
+
+			initialize();
+		}
+
+		public ResumeHandle state() {
+			return state.toResumableForm();
+		}
+
+		private void initialize () {
+			// state vector h - copy values to address reset() requests
+			System.arraycopy( param.initialized_H(), 0, this.state.h, 0, Spec.state_space_len);
+
+			// if we have a key update initial block
+			// Note param has zero padded key_bytes to Spec.max_key_bytes
+			if(param.hasKey){
+				this.update (param.key_bytes, 0, Spec.block_bytes);
+			}
+		}
+
+		public static void main(String... args) {
+			Blake2b mac = Mac.newInstance("LOVE".getBytes());
+			final byte[] hash = mac.digest("Salaam!".getBytes());
+//			Debug.dumpBuffer(System.out, "-- mac hash --", hash);
+		}
+
+		// ---------------------------------------------------------------------
+		// interface: Blake2b API
+		// ---------------------------------------------------------------------
+
+		/** {@inheritDoc} */
+		@Override final public void reset () {
+			// reset cache
+			this.state.buflen = 0;
+			for(int i=0; i < state.buffer.length; i++){
+				state.buffer[ i ] = (byte) 0;
+			}
+
+			// reset flags
+			this.state.f[ 0 ] = 0L;
+			this.state.f[ 1 ] = 0L;
+
+			// reset counters
+			this.state.t[ 0 ] = 0L;
+			this.state.t[ 1 ] = 0L;
+
+			// reset state vector
+			// NOTE: keep as last stmt as init calls update0 for MACs.
+			initialize();
+		}
+
+		/** {@inheritDoc} */
+		@Override final public void update (final byte[] b, int off, int len) {
+			if (b == null) {
+				throw new IllegalArgumentException("input buffer (b) is null");
+			}
+			/* zero or more calls to compress */
+			final long[] t = state.t;
+			final byte[] buffer = state.buffer;
+			while (len > 0) {
+				if ( state.buflen == 0) {
+					/* try compressing direct from input ? */
+					while ( len > Spec.block_bytes ) {
+						t[0] += Spec.block_bytes;
+						t[1] += (t[0] < 0 && state.buflen > -t[0]) ? 1 : 0;
+						compress( b, off);
+						len -= Spec.block_bytes;
+						off += Spec.block_bytes;
+					}
+				} else if ( state.buflen == Spec.block_bytes ) {
+					/* flush */
+					t[0] += Spec.block_bytes;
+					t[1] += t[0] == 0 ? 1 : 0;
+					compress( buffer, 0 );
+					state.buflen = 0;
+					continue;
+				}
+
+				// "are we there yet?"
+				if( len == 0 ) return;
+
+				final int cap = Spec.block_bytes - state.buflen;
+				final int fill = len > cap ? cap : len;
+				System.arraycopy( b, off, buffer, state.buflen, fill );
+				state.buflen += fill;
+				len -= fill;
+				off += fill;
+			}
+		}
+
+		/** {@inheritDoc} */
+		@Override final public void update (byte b) {
+			oneByte[0] = b;
+			update (oneByte, 0, 1);
+		}
+
+		/** {@inheritDoc} */
+		@Override final public void update(byte[] input) {
+			update (input, 0, input.length);
+		}
+
+		/** {@inheritDoc} */
+		@Override final public void digest(byte[] output, int off, int len) {
+			// zero pad last block; set last block flags; and compress
+			System.arraycopy( zeropad, 0, state.buffer, state.buflen, Spec.block_bytes - state.buflen);
+			if(state.buflen > 0) {
+				this.state.t[0] += state.buflen;
+				this.state.t[1] += this.state.t[0] == 0 ? 1 : 0;
+			}
+
+			this.state.f[ flag.last_block ] = 0xFFFFFFFFFFFFFFFFL;
+			this.state.f[ flag.last_node ] = this.state.last_node ? 0xFFFFFFFFFFFFFFFFL : 0x0L;
+
+			// compres and write final out (truncated to len) to output
+			compress( state.buffer, 0 );
+			hashout( output, off, len );
+
+			reset();
+		}
+
+		/** {@inheritDoc} */
+		@Override final public byte[] digest () throws IllegalArgumentException {
+			final byte[] out = new byte [state.outlen];
+			digest ( out, 0, state.outlen );
+			return out;
+		}
+
+		/** {@inheritDoc} */
+		@Override final public byte[] digest (byte[] input) {
+			update(input, 0, input.length);
+			return digest();
+		}
+
+		// ---------------------------------------------------------------------
+		// Internal Ops
+		// ---------------------------------------------------------------------
+
+		/**
+		 * write out the digest output from the 'h' registers.
+		 * truncate full output if necessary.
+		 */
+		private void hashout (final byte[] out, final int offset, final int hashlen) {
+			// write max number of whole longs
+			final int lcnt = hashlen >>> 3;
+			long v = 0;
+			int i = offset;
+			final long[] h = state.h;
+			for (int w = 0; w < lcnt; w++) {
+				v = h [ w ];
+				out [ i ] = (byte) v; v >>>= 8;
+				out [ i+1 ] = (byte) v; v >>>= 8;
+				out [ i+2 ] = (byte) v; v >>>= 8;
+				out [ i+3 ] = (byte) v; v >>>= 8;
+				out [ i+4 ] = (byte) v; v >>>= 8;
+				out [ i+5 ] = (byte) v; v >>>= 8;
+				out [ i+6 ] = (byte) v; v >>>= 8;
+				out [ i+7 ] = (byte) v;
+				i+=8;
+			}
+
+			// basta?
+			if( hashlen == Spec.max_digest_bytes) return;
+
+			// write the remaining bytes of a partial long value
+			v = h [ lcnt ];
+			i = lcnt << 3;
+			while( i < hashlen ) {
+				out [ offset + i ] = (byte) v; v >>>= 8; ++i;
+			}
+		}
+
+		////////////////////////////////////////////////////////////////////////
+		/// Compression Kernel /////////////////////////////////////////// BEGIN
+		////////////////////////////////////////////////////////////////////////
+
+		/** compress Spec.block_bytes data from b, from offset */
+		private void compress (final byte[] b, final int offset) {
+
+			// set m registers
+			final long[] m = state.m;
+			m[ 0] = LittleEndian.readLong(b, offset);
+			m[ 1] = LittleEndian.readLong(b, offset + 8);
+			m[ 2] = LittleEndian.readLong(b, offset + 16);
+			m[ 3] = LittleEndian.readLong(b, offset + 24);
+			m[ 4] = LittleEndian.readLong(b, offset + 32);
+			m[ 5] = LittleEndian.readLong(b, offset + 40);
+			m[ 6] = LittleEndian.readLong(b, offset + 48);
+			m[ 7] = LittleEndian.readLong(b, offset + 56);
+			m[ 8] = LittleEndian.readLong(b, offset + 64);
+			m[ 9] = LittleEndian.readLong(b, offset + 72);
+			m[10] = LittleEndian.readLong(b, offset + 80);
+			m[11] = LittleEndian.readLong(b, offset + 88);
+			m[12] = LittleEndian.readLong(b, offset + 96);
+			m[13] = LittleEndian.readLong(b, offset + 104);
+			m[14] = LittleEndian.readLong(b, offset + 112);
+			m[15] = LittleEndian.readLong(b, offset + 120);
+
+			// set v registers
+			final   long[]  v = state.v;
+			final   long[]  h = state.h;
+			final   long[]  t = state.t;
+			final   long[]  f = state.f;
+			v[ 0] = h[0];
+			v[ 1] = h[1];
+			v[ 2] = h[2];
+			v[ 3] = h[3];
+			v[ 4] = h[4];
+			v[ 5] = h[5];
+			v[ 6] = h[6];
+			v[ 7] = h[7];
+			v[ 8] =         0x6a09e667f3bcc908L;
+			v[ 9] =         0xbb67ae8584caa73bL;
+			v[10] =         0x3c6ef372fe94f82bL;
+			v[11] =         0xa54ff53a5f1d36f1L;
+			v[12] = t [0] ^ 0x510e527fade682d1L;
+			v[13] = t [1] ^ 0x9b05688c2b3e6c1fL;
+			v[14] = f [0] ^ 0x1f83d9abfb41bd6bL;
+			v[15] = f [1] ^ 0x5be0cd19137e2179L;
+
+			// do the rounds
+			round_0(v, m);
+			round_1(v, m);
+			round_2(v, m);
+			round_3(v, m);
+			round_4(v, m);
+			round_5(v, m);
+			round_6(v, m);
+			round_7(v, m);
+			round_8(v, m);
+			round_9(v, m);
+			round_0(v, m); // round 10 is identical to round 0
+			round_1(v, m); // round 11 is identical to round 1
+
+			// Update state vector h
+			h[0] ^= v[0] ^ v[8];
+			h[1] ^= v[1] ^ v[9];
+			h[2] ^= v[2] ^ v[10];
+			h[3] ^= v[3] ^ v[11];
+			h[4] ^= v[4] ^ v[12];
+			h[5] ^= v[5] ^ v[13];
+			h[6] ^= v[6] ^ v[14];
+			h[7] ^= v[7] ^ v[15];
+
+			/* kaamil */
+		}
+		private void round_0(final long[] v, final long[] m) {
+			v[ 0] = v[ 0] + v[ 4] + m[0];
+			v[12] ^= v[ 0];
+			v[12] = ( v[12] << 32 ) | ( v[12] >>> 32 );
+			v[ 8] = v[ 8] + v[12];
+			v[ 4] ^= v[ 8];
+			v[ 4] = ( v[ 4] >>> 24 ) | ( v[ 4] << 40 );
+			v[ 0] = v[ 0] + v[ 4] + m [1];
+			v[12] ^= v[ 0];
+			v[12] = ( v[12] >>> 16 ) | ( v[12] << 48 );
+			v[ 8] = v[ 8] + v[12];
+			v[ 4] ^= v[ 8];
+			v[ 4] = ( v[ 4] << 1 ) | ( v[ 4] >>> 63 );
+
+			v[ 1] = v[ 1] + v[ 5] + m[2];
+			v[13] ^= v[ 1];
+			v[13] = ( v[13] << 32 ) | ( v[13] >>> 32 );
+			v[ 9] = v[ 9] + v[13];
+			v[ 5] ^= v[ 9];
+			v[ 5] = ( v[ 5] >>> 24 ) | ( v[ 5] << 40 );
+			v[ 1] = v[ 1] + v[ 5] + m[3];
+			v[13] ^= v[ 1];
+			v[13] = ( v[13] >>> 16 ) | ( v[13] << 48 );
+			v[ 9] = v[ 9] + v[13];
+			v[ 5] ^= v[ 9];
+			v[ 5] = ( v[ 5] << 1 ) | ( v[ 5] >>> 63 );
+
+			v[ 2] = v[ 2] + v[ 6] + m[4];
+			v[14] ^= v[ 2];
+			v[14] = ( v[14] << 32 ) | ( v[14] >>> 32 );
+			v[10] = v[10] + v[14];
+			v[ 6] ^= v[10];
+			v[ 6] = ( v[ 6] >>> 24 ) | ( v[ 6] << 40 );
+			v[ 2] = v[ 2] + v[ 6] + m[5];
+			v[14] ^= v[ 2];
+			v[14] = ( v[14] >>> 16 ) | ( v[14] << 48 );
+			v[10] = v[10] + v[14];
+			v[ 6] ^= v[10];
+			v[ 6] = ( v[ 6] << 1 ) | ( v[ 6] >>> 63 );
+
+			v[ 3] = v[ 3] + v[ 7] + m[6];
+			v[15] ^= v[ 3];
+			v[15] = ( v[15] << 32 ) | ( v[15] >>> 32 );
+			v[11] = v[11] + v[15];
+			v[ 7] ^= v[11];
+			v[ 7] = ( v[ 7] >>> 24 ) | ( v[ 7] << 40 );
+			v[ 3] = v[ 3] + v[ 7] + m[7];
+			v[15] ^= v[ 3];
+			v[15] = ( v[15] >>> 16 ) | ( v[15] << 48 );
+			v[11] = v[11] + v[15];
+			v[ 7] ^= v[11];
+			v[ 7] = ( v[ 7] << 1 ) | ( v[ 7] >>> 63 );
+
+			v[ 0] = v[ 0] + v[ 5] + m[8];
+			v[15] ^= v[ 0];
+			v[15] = ( v[15] << 32 ) | ( v[15] >>> 32 );
+			v[10] = v[10] + v[15];
+			v[ 5] ^= v[10];
+			v[ 5] = ( v[ 5] >>> 24 ) | ( v[ 5] << 40 );
+			v[ 0] = v[ 0] + v[ 5] + m[9];
+			v[15] ^= v[ 0];
+			v[15] = ( v[15] >>> 16 ) | ( v[15] << 48 );
+			v[10] = v[10] + v[15];
+			v[ 5] ^= v[10];
+			v[ 5] = ( v[ 5] << 1 ) | ( v[ 5] >>> 63 );
+
+			v[ 1] = v[ 1] + v[ 6] + m[10];
+			v[12] ^= v[ 1];
+			v[12] = ( v[12] << 32 ) | ( v[12] >>> 32 );
+			v[11] = v[11] + v[12];
+			v[ 6] ^= v[11];
+			v[ 6] = ( v[ 6] >>> 24 ) | ( v[ 6] << 40 );
+			v[ 1] = v[ 1] + v[ 6] + + m[11];
+			v[12] ^= v[ 1];
+			v[12] = ( v[12] >>> 16 ) | ( v[12] << 48 );
+			v[11] = v[11] + v[12];
+			v[ 6] ^= v[11];
+			v[ 6] = ( v[ 6] << 1 ) | ( v[ 6] >>> 63 );
+
+			v[ 2] = v[ 2] + v[ 7] + m[12];
+			v[13] ^= v[ 2];
+			v[13] = ( v[13] << 32 ) | ( v[13] >>> 32 );
+			v[ 8] = v[ 8] + v[13];
+			v[ 7] ^= v[ 8];
+			v[ 7] = ( v[ 7] >>> 24 ) | ( v[ 7] << 40 );
+			v[ 2] = v[ 2] + v[ 7] + m[13];
+			v[13] ^= v[ 2];
+			v[13] = ( v[13] >>> 16 ) | ( v[13] << 48 );
+			v[ 8] = v[ 8] + v[13];
+			v[ 7] ^= v[ 8];
+			v[ 7] = ( v[ 7] << 1 ) | ( v[ 7] >>> 63 );
+
+			v[ 3] = v[ 3] + v[ 4] + m[14];
+			v[14] ^= v[ 3];
+			v[14] = ( v[14] << 32 ) | ( v[14] >>> 32 );
+			v[ 9] = v[ 9] + v[14];
+			v[ 4] ^= v[ 9];
+			v[ 4] = ( v[ 4] >>> 24 ) | ( v[ 4] << 40 );
+			v[ 3] = v[ 3] + v[ 4] + m[15];
+			v[14] ^= v[ 3];
+			v[14] = ( v[14] >>> 16 ) | ( v[14] << 48 );
+			v[ 9] = v[ 9] + v[14];
+			v[ 4] ^= v[ 9];
+			v[ 4] = ( v[ 4] << 1 ) | ( v[ 4] >>> 63 );
+		}
+		private void round_1(final long[] v, final long[] m) {
+			v[ 0] = v[ 0] + v[ 4] + m[14];
+			v[12] ^= v[ 0];
+			v[12] = ( v[12] << 32 ) | ( v[12] >>> 32 );
+			v[ 8] = v[ 8] + v[12];
+			v[ 4] ^= v[ 8];
+			v[ 4] = ( v[ 4] >>> 24 ) | ( v[ 4] << 40 );
+			v[ 0] = v[ 0] + v[ 4] + m [10];
+			v[12] ^= v[ 0];
+			v[12] = ( v[12] >>> 16 ) | ( v[12] << 48 );
+			v[ 8] = v[ 8] + v[12];
+			v[ 4] ^= v[ 8];
+			v[ 4] = ( v[ 4] << 1 ) | ( v[ 4] >>> 63 );
+
+			v[ 1] = v[ 1] + v[ 5] + m[4];
+			v[13] ^= v[ 1];
+			v[13] = ( v[13] << 32 ) | ( v[13] >>> 32 );
+			v[ 9] = v[ 9] + v[13];
+			v[ 5] ^= v[ 9];
+			v[ 5] = ( v[ 5] >>> 24 ) | ( v[ 5] << 40 );
+			v[ 1] = v[ 1] + v[ 5] + m[8];
+			v[13] ^= v[ 1];
+			v[13] = ( v[13] >>> 16 ) | ( v[13] << 48 );
+			v[ 9] = v[ 9] + v[13];
+			v[ 5] ^= v[ 9];
+			v[ 5] = ( v[ 5] << 1 ) | ( v[ 5] >>> 63 );
+
+			v[ 2] = v[ 2] + v[ 6] + m[9];
+			v[14] ^= v[ 2];
+			v[14] = ( v[14] << 32 ) | ( v[14] >>> 32 );
+			v[10] = v[10] + v[14];
+			v[ 6] ^= v[10];
+			v[ 6] = ( v[ 6] >>> 24 ) | ( v[ 6] << 40 );
+			v[ 2] = v[ 2] + v[ 6] + m[15];
+			v[14] ^= v[ 2];
+			v[14] = ( v[14] >>> 16 ) | ( v[14] << 48 );
+			v[10] = v[10] + v[14];
+			v[ 6] ^= v[10];
+			v[ 6] = ( v[ 6] << 1 ) | ( v[ 6] >>> 63 );
+
+			v[ 3] = v[ 3] + v[ 7] + m[13];
+			v[15] ^= v[ 3];
+			v[15] = ( v[15] << 32 ) | ( v[15] >>> 32 );
+			v[11] = v[11] + v[15];
+			v[ 7] ^= v[11];
+			v[ 7] = ( v[ 7] >>> 24 ) | ( v[ 7] << 40 );
+			v[ 3] = v[ 3] + v[ 7] + m[6];
+			v[15] ^= v[ 3];
+			v[15] = ( v[15] >>> 16 ) | ( v[15] << 48 );
+			v[11] = v[11] + v[15];
+			v[ 7] ^= v[11];
+			v[ 7] = ( v[ 7] << 1 ) | ( v[ 7] >>> 63 );
+
+			v[ 0] = v[ 0] + v[ 5] + m[1];
+			v[15] ^= v[ 0];
+			v[15] = ( v[15] << 32 ) | ( v[15] >>> 32 );
+			v[10] = v[10] + v[15];
+			v[ 5] ^= v[10];
+			v[ 5] = ( v[ 5] >>> 24 ) | ( v[ 5] << 40 );
+			v[ 0] = v[ 0] + v[ 5] + m[12];
+			v[15] ^= v[ 0];
+			v[15] = ( v[15] >>> 16 ) | ( v[15] << 48 );
+			v[10] = v[10] + v[15];
+			v[ 5] ^= v[10];
+			v[ 5] = ( v[ 5] << 1 ) | ( v[ 5] >>> 63 );
+
+			v[ 1] = v[ 1] + v[ 6] + m[0];
+			v[12] ^= v[ 1];
+			v[12] = ( v[12] << 32 ) | ( v[12] >>> 32 );
+			v[11] = v[11] + v[12];
+			v[ 6] ^= v[11];
+			v[ 6] = ( v[ 6] >>> 24 ) | ( v[ 6] << 40 );
+			v[ 1] = v[ 1] + v[ 6] + + m[2];
+			v[12] ^= v[ 1];
+			v[12] = ( v[12] >>> 16 ) | ( v[12] << 48 );
+			v[11] = v[11] + v[12];
+			v[ 6] ^= v[11];
+			v[ 6] = ( v[ 6] << 1 ) | ( v[ 6] >>> 63 );
+
+			v[ 2] = v[ 2] + v[ 7] + m[11];
+			v[13] ^= v[ 2];
+			v[13] = ( v[13] << 32 ) | ( v[13] >>> 32 );
+			v[ 8] = v[ 8] + v[13];
+			v[ 7] ^= v[ 8];
+			v[ 7] = ( v[ 7] >>> 24 ) | ( v[ 7] << 40 );
+			v[ 2] = v[ 2] + v[ 7] + m[7];
+			v[13] ^= v[ 2];
+			v[13] = ( v[13] >>> 16 ) | ( v[13] << 48 );
+			v[ 8] = v[ 8] + v[13];
+			v[ 7] ^= v[ 8];
+			v[ 7] = ( v[ 7] << 1 ) | ( v[ 7] >>> 63 );
+
+			v[ 3] = v[ 3] + v[ 4] + m[5];
+			v[14] ^= v[ 3];
+			v[14] = ( v[14] << 32 ) | ( v[14] >>> 32 );
+			v[ 9] = v[ 9] + v[14];
+			v[ 4] ^= v[ 9];
+			v[ 4] = ( v[ 4] >>> 24 ) | ( v[ 4] << 40 );
+			v[ 3] = v[ 3] + v[ 4] + m[3];
+			v[14] ^= v[ 3];
+			v[14] = ( v[14] >>> 16 ) | ( v[14] << 48 );
+			v[ 9] = v[ 9] + v[14];
+			v[ 4] ^= v[ 9];
+			v[ 4] = ( v[ 4] << 1 ) | ( v[ 4] >>> 63 );
+		}
+		private void round_2(final long[] v, final long[] m) {
+			v[ 0] = v[ 0] + v[ 4] + m[11];
+			v[12] ^= v[ 0];
+			v[12] = ( v[12] << 32 ) | ( v[12] >>> 32 );
+			v[ 8] = v[ 8] + v[12];
+			v[ 4] ^= v[ 8];
+			v[ 4] = ( v[ 4] >>> 24 ) | ( v[ 4] << 40 );
+			v[ 0] = v[ 0] + v[ 4] + m [8];
+			v[12] ^= v[ 0];
+			v[12] = ( v[12] >>> 16 ) | ( v[12] << 48 );
+			v[ 8] = v[ 8] + v[12];
+			v[ 4] ^= v[ 8];
+			v[ 4] = ( v[ 4] << 1 ) | ( v[ 4] >>> 63 );
+
+			v[ 1] = v[ 1] + v[ 5] + m[12];
+			v[13] ^= v[ 1];
+			v[13] = ( v[13] << 32 ) | ( v[13] >>> 32 );
+			v[ 9] = v[ 9] + v[13];
+			v[ 5] ^= v[ 9];
+			v[ 5] = ( v[ 5] >>> 24 ) | ( v[ 5] << 40 );
+			v[ 1] = v[ 1] + v[ 5] + m[0];
+			v[13] ^= v[ 1];
+			v[13] = ( v[13] >>> 16 ) | ( v[13] << 48 );
+			v[ 9] = v[ 9] + v[13];
+			v[ 5] ^= v[ 9];
+			v[ 5] = ( v[ 5] << 1 ) | ( v[ 5] >>> 63 );
+
+			v[ 2] = v[ 2] + v[ 6] + m[5];
+			v[14] ^= v[ 2];
+			v[14] = ( v[14] << 32 ) | ( v[14] >>> 32 );
+			v[10] = v[10] + v[14];
+			v[ 6] ^= v[10];
+			v[ 6] = ( v[ 6] >>> 24 ) | ( v[ 6] << 40 );
+			v[ 2] = v[ 2] + v[ 6] + m[2];
+			v[14] ^= v[ 2];
+			v[14] = ( v[14] >>> 16 ) | ( v[14] << 48 );
+			v[10] = v[10] + v[14];
+			v[ 6] ^= v[10];
+			v[ 6] = ( v[ 6] << 1 ) | ( v[ 6] >>> 63 );
+
+			v[ 3] = v[ 3] + v[ 7] + m[15];
+			v[15] ^= v[ 3];
+			v[15] = ( v[15] << 32 ) | ( v[15] >>> 32 );
+			v[11] = v[11] + v[15];
+			v[ 7] ^= v[11];
+			v[ 7] = ( v[ 7] >>> 24 ) | ( v[ 7] << 40 );
+			v[ 3] = v[ 3] + v[ 7] + m[13];
+			v[15] ^= v[ 3];
+			v[15] = ( v[15] >>> 16 ) | ( v[15] << 48 );
+			v[11] = v[11] + v[15];
+			v[ 7] ^= v[11];
+			v[ 7] = ( v[ 7] << 1 ) | ( v[ 7] >>> 63 );
+
+			v[ 0] = v[ 0] + v[ 5] + m[10];
+			v[15] ^= v[ 0];
+			v[15] = ( v[15] << 32 ) | ( v[15] >>> 32 );
+			v[10] = v[10] + v[15];
+			v[ 5] ^= v[10];
+			v[ 5] = ( v[ 5] >>> 24 ) | ( v[ 5] << 40 );
+			v[ 0] = v[ 0] + v[ 5] + m[14];
+			v[15] ^= v[ 0];
+			v[15] = ( v[15] >>> 16 ) | ( v[15] << 48 );
+			v[10] = v[10] + v[15];
+			v[ 5] ^= v[10];
+			v[ 5] = ( v[ 5] << 1 ) | ( v[ 5] >>> 63 );
+
+			v[ 1] = v[ 1] + v[ 6] + m[3];
+			v[12] ^= v[ 1];
+			v[12] = ( v[12] << 32 ) | ( v[12] >>> 32 );
+			v[11] = v[11] + v[12];
+			v[ 6] ^= v[11];
+			v[ 6] = ( v[ 6] >>> 24 ) | ( v[ 6] << 40 );
+			v[ 1] = v[ 1] + v[ 6] + + m[6];
+			v[12] ^= v[ 1];
+			v[12] = ( v[12] >>> 16 ) | ( v[12] << 48 );
+			v[11] = v[11] + v[12];
+			v[ 6] ^= v[11];
+			v[ 6] = ( v[ 6] << 1 ) | ( v[ 6] >>> 63 );
+
+			v[ 2] = v[ 2] + v[ 7] + m[7];
+			v[13] ^= v[ 2];
+			v[13] = ( v[13] << 32 ) | ( v[13] >>> 32 );
+			v[ 8] = v[ 8] + v[13];
+			v[ 7] ^= v[ 8];
+			v[ 7] = ( v[ 7] >>> 24 ) | ( v[ 7] << 40 );
+			v[ 2] = v[ 2] + v[ 7] + m[1];
+			v[13] ^= v[ 2];
+			v[13] = ( v[13] >>> 16 ) | ( v[13] << 48 );
+			v[ 8] = v[ 8] + v[13];
+			v[ 7] ^= v[ 8];
+			v[ 7] = ( v[ 7] << 1 ) | ( v[ 7] >>> 63 );
+
+			v[ 3] = v[ 3] + v[ 4] + m[9];
+			v[14] ^= v[ 3];
+			v[14] = ( v[14] << 32 ) | ( v[14] >>> 32 );
+			v[ 9] = v[ 9] + v[14];
+			v[ 4] ^= v[ 9];
+			v[ 4] = ( v[ 4] >>> 24 ) | ( v[ 4] << 40 );
+			v[ 3] = v[ 3] + v[ 4] + m[4];
+			v[14] ^= v[ 3];
+			v[14] = ( v[14] >>> 16 ) | ( v[14] << 48 );
+			v[ 9] = v[ 9] + v[14];
+			v[ 4] ^= v[ 9];
+			v[ 4] = ( v[ 4] << 1 ) | ( v[ 4] >>> 63 );
+		}
+		private void round_3(final long[] v, final long[] m) {
+			v[ 0] = v[ 0] + v[ 4] + m[7];
+			v[12] ^= v[ 0];
+			v[12] = ( v[12] << 32 ) | ( v[12] >>> 32 );
+			v[ 8] = v[ 8] + v[12];
+			v[ 4] ^= v[ 8];
+			v[ 4] = ( v[ 4] >>> 24 ) | ( v[ 4] << 40 );
+			v[ 0] = v[ 0] + v[ 4] + m [9];
+			v[12] ^= v[ 0];
+			v[12] = ( v[12] >>> 16 ) | ( v[12] << 48 );
+			v[ 8] = v[ 8] + v[12];
+			v[ 4] ^= v[ 8];
+			v[ 4] = ( v[ 4] << 1 ) | ( v[ 4] >>> 63 );
+
+			v[ 1] = v[ 1] + v[ 5] + m[3];
+			v[13] ^= v[ 1];
+			v[13] = ( v[13] << 32 ) | ( v[13] >>> 32 );
+			v[ 9] = v[ 9] + v[13];
+			v[ 5] ^= v[ 9];
+			v[ 5] = ( v[ 5] >>> 24 ) | ( v[ 5] << 40 );
+			v[ 1] = v[ 1] + v[ 5] + m[1];
+			v[13] ^= v[ 1];
+			v[13] = ( v[13] >>> 16 ) | ( v[13] << 48 );
+			v[ 9] = v[ 9] + v[13];
+			v[ 5] ^= v[ 9];
+			v[ 5] = ( v[ 5] << 1 ) | ( v[ 5] >>> 63 );
+
+			v[ 2] = v[ 2] + v[ 6] + m[13];
+			v[14] ^= v[ 2];
+			v[14] = ( v[14] << 32 ) | ( v[14] >>> 32 );
+			v[10] = v[10] + v[14];
+			v[ 6] ^= v[10];
+			v[ 6] = ( v[ 6] >>> 24 ) | ( v[ 6] << 40 );
+			v[ 2] = v[ 2] + v[ 6] + m[12];
+			v[14] ^= v[ 2];
+			v[14] = ( v[14] >>> 16 ) | ( v[14] << 48 );
+			v[10] = v[10] + v[14];
+			v[ 6] ^= v[10];
+			v[ 6] = ( v[ 6] << 1 ) | ( v[ 6] >>> 63 );
+
+			v[ 3] = v[ 3] + v[ 7] + m[11];
+			v[15] ^= v[ 3];
+			v[15] = ( v[15] << 32 ) | ( v[15] >>> 32 );
+			v[11] = v[11] + v[15];
+			v[ 7] ^= v[11];
+			v[ 7] = ( v[ 7] >>> 24 ) | ( v[ 7] << 40 );
+			v[ 3] = v[ 3] + v[ 7] + m[14];
+			v[15] ^= v[ 3];
+			v[15] = ( v[15] >>> 16 ) | ( v[15] << 48 );
+			v[11] = v[11] + v[15];
+			v[ 7] ^= v[11];
+			v[ 7] = ( v[ 7] << 1 ) | ( v[ 7] >>> 63 );
+
+			v[ 0] = v[ 0] + v[ 5] + m[2];
+			v[15] ^= v[ 0];
+			v[15] = ( v[15] << 32 ) | ( v[15] >>> 32 );
+			v[10] = v[10] + v[15];
+			v[ 5] ^= v[10];
+			v[ 5] = ( v[ 5] >>> 24 ) | ( v[ 5] << 40 );
+			v[ 0] = v[ 0] + v[ 5] + m[6];
+			v[15] ^= v[ 0];
+			v[15] = ( v[15] >>> 16 ) | ( v[15] << 48 );
+			v[10] = v[10] + v[15];
+			v[ 5] ^= v[10];
+			v[ 5] = ( v[ 5] << 1 ) | ( v[ 5] >>> 63 );
+
+			v[ 1] = v[ 1] + v[ 6] + m[5];
+			v[12] ^= v[ 1];
+			v[12] = ( v[12] << 32 ) | ( v[12] >>> 32 );
+			v[11] = v[11] + v[12];
+			v[ 6] ^= v[11];
+			v[ 6] = ( v[ 6] >>> 24 ) | ( v[ 6] << 40 );
+			v[ 1] = v[ 1] + v[ 6] + + m[10];
+			v[12] ^= v[ 1];
+			v[12] = ( v[12] >>> 16 ) | ( v[12] << 48 );
+			v[11] = v[11] + v[12];
+			v[ 6] ^= v[11];
+			v[ 6] = ( v[ 6] << 1 ) | ( v[ 6] >>> 63 );
+
+			v[ 2] = v[ 2] + v[ 7] + m[4];
+			v[13] ^= v[ 2];
+			v[13] = ( v[13] << 32 ) | ( v[13] >>> 32 );
+			v[ 8] = v[ 8] + v[13];
+			v[ 7] ^= v[ 8];
+			v[ 7] = ( v[ 7] >>> 24 ) | ( v[ 7] << 40 );
+			v[ 2] = v[ 2] + v[ 7] + m[0];
+			v[13] ^= v[ 2];
+			v[13] = ( v[13] >>> 16 ) | ( v[13] << 48 );
+			v[ 8] = v[ 8] + v[13];
+			v[ 7] ^= v[ 8];
+			v[ 7] = ( v[ 7] << 1 ) | ( v[ 7] >>> 63 );
+
+			v[ 3] = v[ 3] + v[ 4] + m[15];
+			v[14] ^= v[ 3];
+			v[14] = ( v[14] << 32 ) | ( v[14] >>> 32 );
+			v[ 9] = v[ 9] + v[14];
+			v[ 4] ^= v[ 9];
+			v[ 4] = ( v[ 4] >>> 24 ) | ( v[ 4] << 40 );
+			v[ 3] = v[ 3] + v[ 4] + m[8];
+			v[14] ^= v[ 3];
+			v[14] = ( v[14] >>> 16 ) | ( v[14] << 48 );
+			v[ 9] = v[ 9] + v[14];
+			v[ 4] ^= v[ 9];
+			v[ 4] = ( v[ 4] << 1 ) | ( v[ 4] >>> 63 );
+		}
+		private void round_4(final long[] v, final long[] m) {
+			v[ 0] = v[ 0] + v[ 4] + m[9];
+			v[12] ^= v[ 0];
+			v[12] = ( v[12] << 32 ) | ( v[12] >>> 32 );
+			v[ 8] = v[ 8] + v[12];
+			v[ 4] ^= v[ 8];
+			v[ 4] = ( v[ 4] >>> 24 ) | ( v[ 4] << 40 );
+			v[ 0] = v[ 0] + v[ 4] + m [0];
+			v[12] ^= v[ 0];
+			v[12] = ( v[12] >>> 16 ) | ( v[12] << 48 );
+			v[ 8] = v[ 8] + v[12];
+			v[ 4] ^= v[ 8];
+			v[ 4] = ( v[ 4] << 1 ) | ( v[ 4] >>> 63 );
+
+			v[ 1] = v[ 1] + v[ 5] + m[5];
+			v[13] ^= v[ 1];
+			v[13] = ( v[13] << 32 ) | ( v[13] >>> 32 );
+			v[ 9] = v[ 9] + v[13];
+			v[ 5] ^= v[ 9];
+			v[ 5] = ( v[ 5] >>> 24 ) | ( v[ 5] << 40 );
+			v[ 1] = v[ 1] + v[ 5] + m[7];
+			v[13] ^= v[ 1];
+			v[13] = ( v[13] >>> 16 ) | ( v[13] << 48 );
+			v[ 9] = v[ 9] + v[13];
+			v[ 5] ^= v[ 9];
+			v[ 5] = ( v[ 5] << 1 ) | ( v[ 5] >>> 63 );
+
+			v[ 2] = v[ 2] + v[ 6] + m[2];
+			v[14] ^= v[ 2];
+			v[14] = ( v[14] << 32 ) | ( v[14] >>> 32 );
+			v[10] = v[10] + v[14];
+			v[ 6] ^= v[10];
+			v[ 6] = ( v[ 6] >>> 24 ) | ( v[ 6] << 40 );
+			v[ 2] = v[ 2] + v[ 6] + m[4];
+			v[14] ^= v[ 2];
+			v[14] = ( v[14] >>> 16 ) | ( v[14] << 48 );
+			v[10] = v[10] + v[14];
+			v[ 6] ^= v[10];
+			v[ 6] = ( v[ 6] << 1 ) | ( v[ 6] >>> 63 );
+
+			v[ 3] = v[ 3] + v[ 7] + m[10];
+			v[15] ^= v[ 3];
+			v[15] = ( v[15] << 32 ) | ( v[15] >>> 32 );
+			v[11] = v[11] + v[15];
+			v[ 7] ^= v[11];
+			v[ 7] = ( v[ 7] >>> 24 ) | ( v[ 7] << 40 );
+			v[ 3] = v[ 3] + v[ 7] + m[15];
+			v[15] ^= v[ 3];
+			v[15] = ( v[15] >>> 16 ) | ( v[15] << 48 );
+			v[11] = v[11] + v[15];
+			v[ 7] ^= v[11];
+			v[ 7] = ( v[ 7] << 1 ) | ( v[ 7] >>> 63 );
+
+			v[ 0] = v[ 0] + v[ 5] + m[14];
+			v[15] ^= v[ 0];
+			v[15] = ( v[15] << 32 ) | ( v[15] >>> 32 );
+			v[10] = v[10] + v[15];
+			v[ 5] ^= v[10];
+			v[ 5] = ( v[ 5] >>> 24 ) | ( v[ 5] << 40 );
+			v[ 0] = v[ 0] + v[ 5] + m[1];
+			v[15] ^= v[ 0];
+			v[15] = ( v[15] >>> 16 ) | ( v[15] << 48 );
+			v[10] = v[10] + v[15];
+			v[ 5] ^= v[10];
+			v[ 5] = ( v[ 5] << 1 ) | ( v[ 5] >>> 63 );
+
+			v[ 1] = v[ 1] + v[ 6] + m[11];
+			v[12] ^= v[ 1];
+			v[12] = ( v[12] << 32 ) | ( v[12] >>> 32 );
+			v[11] = v[11] + v[12];
+			v[ 6] ^= v[11];
+			v[ 6] = ( v[ 6] >>> 24 ) | ( v[ 6] << 40 );
+			v[ 1] = v[ 1] + v[ 6] + + m[12];
+			v[12] ^= v[ 1];
+			v[12] = ( v[12] >>> 16 ) | ( v[12] << 48 );
+			v[11] = v[11] + v[12];
+			v[ 6] ^= v[11];
+			v[ 6] = ( v[ 6] << 1 ) | ( v[ 6] >>> 63 );
+
+			v[ 2] = v[ 2] + v[ 7] + m[6];
+			v[13] ^= v[ 2];
+			v[13] = ( v[13] << 32 ) | ( v[13] >>> 32 );
+			v[ 8] = v[ 8] + v[13];
+			v[ 7] ^= v[ 8];
+			v[ 7] = ( v[ 7] >>> 24 ) | ( v[ 7] << 40 );
+			v[ 2] = v[ 2] + v[ 7] + m[8];
+			v[13] ^= v[ 2];
+			v[13] = ( v[13] >>> 16 ) | ( v[13] << 48 );
+			v[ 8] = v[ 8] + v[13];
+			v[ 7] ^= v[ 8];
+			v[ 7] = ( v[ 7] << 1 ) | ( v[ 7] >>> 63 );
+
+			v[ 3] = v[ 3] + v[ 4] + m[3];
+			v[14] ^= v[ 3];
+			v[14] = ( v[14] << 32 ) | ( v[14] >>> 32 );
+			v[ 9] = v[ 9] + v[14];
+			v[ 4] ^= v[ 9];
+			v[ 4] = ( v[ 4] >>> 24 ) | ( v[ 4] << 40 );
+			v[ 3] = v[ 3] + v[ 4] + m[13];
+			v[14] ^= v[ 3];
+			v[14] = ( v[14] >>> 16 ) | ( v[14] << 48 );
+			v[ 9] = v[ 9] + v[14];
+			v[ 4] ^= v[ 9];
+			v[ 4] = ( v[ 4] << 1 ) | ( v[ 4] >>> 63 );
+		}
+		private void round_5(final long[] v, final long[] m) {
+			v[ 0] = v[ 0] + v[ 4] + m[2];
+			v[12] ^= v[ 0];
+			v[12] = ( v[12] << 32 ) | ( v[12] >>> 32 );
+			v[ 8] = v[ 8] + v[12];
+			v[ 4] ^= v[ 8];
+			v[ 4] = ( v[ 4] >>> 24 ) | ( v[ 4] << 40 );
+			v[ 0] = v[ 0] + v[ 4] + m [12];
+			v[12] ^= v[ 0];
+			v[12] = ( v[12] >>> 16 ) | ( v[12] << 48 );
+			v[ 8] = v[ 8] + v[12];
+			v[ 4] ^= v[ 8];
+			v[ 4] = ( v[ 4] << 1 ) | ( v[ 4] >>> 63 );
+
+			v[ 1] = v[ 1] + v[ 5] + m[6];
+			v[13] ^= v[ 1];
+			v[13] = ( v[13] << 32 ) | ( v[13] >>> 32 );
+			v[ 9] = v[ 9] + v[13];
+			v[ 5] ^= v[ 9];
+			v[ 5] = ( v[ 5] >>> 24 ) | ( v[ 5] << 40 );
+			v[ 1] = v[ 1] + v[ 5] + m[10];
+			v[13] ^= v[ 1];
+			v[13] = ( v[13] >>> 16 ) | ( v[13] << 48 );
+			v[ 9] = v[ 9] + v[13];
+			v[ 5] ^= v[ 9];
+			v[ 5] = ( v[ 5] << 1 ) | ( v[ 5] >>> 63 );
+
+			v[ 2] = v[ 2] + v[ 6] + m[0];
+			v[14] ^= v[ 2];
+			v[14] = ( v[14] << 32 ) | ( v[14] >>> 32 );
+			v[10] = v[10] + v[14];
+			v[ 6] ^= v[10];
+			v[ 6] = ( v[ 6] >>> 24 ) | ( v[ 6] << 40 );
+			v[ 2] = v[ 2] + v[ 6] + m[11];
+			v[14] ^= v[ 2];
+			v[14] = ( v[14] >>> 16 ) | ( v[14] << 48 );
+			v[10] = v[10] + v[14];
+			v[ 6] ^= v[10];
+			v[ 6] = ( v[ 6] << 1 ) | ( v[ 6] >>> 63 );
+
+			v[ 3] = v[ 3] + v[ 7] + m[8];
+			v[15] ^= v[ 3];
+			v[15] = ( v[15] << 32 ) | ( v[15] >>> 32 );
+			v[11] = v[11] + v[15];
+			v[ 7] ^= v[11];
+			v[ 7] = ( v[ 7] >>> 24 ) | ( v[ 7] << 40 );
+			v[ 3] = v[ 3] + v[ 7] + m[3];
+			v[15] ^= v[ 3];
+			v[15] = ( v[15] >>> 16 ) | ( v[15] << 48 );
+			v[11] = v[11] + v[15];
+			v[ 7] ^= v[11];
+			v[ 7] = ( v[ 7] << 1 ) | ( v[ 7] >>> 63 );
+
+			v[ 0] = v[ 0] + v[ 5] + m[4];
+			v[15] ^= v[ 0];
+			v[15] = ( v[15] << 32 ) | ( v[15] >>> 32 );
+			v[10] = v[10] + v[15];
+			v[ 5] ^= v[10];
+			v[ 5] = ( v[ 5] >>> 24 ) | ( v[ 5] << 40 );
+			v[ 0] = v[ 0] + v[ 5] + m[13];
+			v[15] ^= v[ 0];
+			v[15] = ( v[15] >>> 16 ) | ( v[15] << 48 );
+			v[10] = v[10] + v[15];
+			v[ 5] ^= v[10];
+			v[ 5] = ( v[ 5] << 1 ) | ( v[ 5] >>> 63 );
+
+			v[ 1] = v[ 1] + v[ 6] + m[7];
+			v[12] ^= v[ 1];
+			v[12] = ( v[12] << 32 ) | ( v[12] >>> 32 );
+			v[11] = v[11] + v[12];
+			v[ 6] ^= v[11];
+			v[ 6] = ( v[ 6] >>> 24 ) | ( v[ 6] << 40 );
+			v[ 1] = v[ 1] + v[ 6] + + m[5];
+			v[12] ^= v[ 1];
+			v[12] = ( v[12] >>> 16 ) | ( v[12] << 48 );
+			v[11] = v[11] + v[12];
+			v[ 6] ^= v[11];
+			v[ 6] = ( v[ 6] << 1 ) | ( v[ 6] >>> 63 );
+
+			v[ 2] = v[ 2] + v[ 7] + m[15];
+			v[13] ^= v[ 2];
+			v[13] = ( v[13] << 32 ) | ( v[13] >>> 32 );
+			v[ 8] = v[ 8] + v[13];
+			v[ 7] ^= v[ 8];
+			v[ 7] = ( v[ 7] >>> 24 ) | ( v[ 7] << 40 );
+			v[ 2] = v[ 2] + v[ 7] + m[14];
+			v[13] ^= v[ 2];
+			v[13] = ( v[13] >>> 16 ) | ( v[13] << 48 );
+			v[ 8] = v[ 8] + v[13];
+			v[ 7] ^= v[ 8];
+			v[ 7] = ( v[ 7] << 1 ) | ( v[ 7] >>> 63 );
+
+			v[ 3] = v[ 3] + v[ 4] + m[1];
+			v[14] ^= v[ 3];
+			v[14] = ( v[14] << 32 ) | ( v[14] >>> 32 );
+			v[ 9] = v[ 9] + v[14];
+			v[ 4] ^= v[ 9];
+			v[ 4] = ( v[ 4] >>> 24 ) | ( v[ 4] << 40 );
+			v[ 3] = v[ 3] + v[ 4] + m[9];
+			v[14] ^= v[ 3];
+			v[14] = ( v[14] >>> 16 ) | ( v[14] << 48 );
+			v[ 9] = v[ 9] + v[14];
+			v[ 4] ^= v[ 9];
+			v[ 4] = ( v[ 4] << 1 ) | ( v[ 4] >>> 63 );
+		}
+		private void round_6(final long[] v, final long[] m) {
+			v[ 0] = v[ 0] + v[ 4] + m[12];
+			v[12] ^= v[ 0];
+			v[12] = ( v[12] << 32 ) | ( v[12] >>> 32 );
+			v[ 8] = v[ 8] + v[12];
+			v[ 4] ^= v[ 8];
+			v[ 4] = ( v[ 4] >>> 24 ) | ( v[ 4] << 40 );
+			v[ 0] = v[ 0] + v[ 4] + m [5];
+			v[12] ^= v[ 0];
+			v[12] = ( v[12] >>> 16 ) | ( v[12] << 48 );
+			v[ 8] = v[ 8] + v[12];
+			v[ 4] ^= v[ 8];
+			v[ 4] = ( v[ 4] << 1 ) | ( v[ 4] >>> 63 );
+
+			v[ 1] = v[ 1] + v[ 5] + m[1];
+			v[13] ^= v[ 1];
+			v[13] = ( v[13] << 32 ) | ( v[13] >>> 32 );
+			v[ 9] = v[ 9] + v[13];
+			v[ 5] ^= v[ 9];
+			v[ 5] = ( v[ 5] >>> 24 ) | ( v[ 5] << 40 );
+			v[ 1] = v[ 1] + v[ 5] + m[15];
+			v[13] ^= v[ 1];
+			v[13] = ( v[13] >>> 16 ) | ( v[13] << 48 );
+			v[ 9] = v[ 9] + v[13];
+			v[ 5] ^= v[ 9];
+			v[ 5] = ( v[ 5] << 1 ) | ( v[ 5] >>> 63 );
+
+			v[ 2] = v[ 2] + v[ 6] + m[14];
+			v[14] ^= v[ 2];
+			v[14] = ( v[14] << 32 ) | ( v[14] >>> 32 );
+			v[10] = v[10] + v[14];
+			v[ 6] ^= v[10];
+			v[ 6] = ( v[ 6] >>> 24 ) | ( v[ 6] << 40 );
+			v[ 2] = v[ 2] + v[ 6] + m[13];
+			v[14] ^= v[ 2];
+			v[14] = ( v[14] >>> 16 ) | ( v[14] << 48 );
+			v[10] = v[10] + v[14];
+			v[ 6] ^= v[10];
+			v[ 6] = ( v[ 6] << 1 ) | ( v[ 6] >>> 63 );
+
+			v[ 3] = v[ 3] + v[ 7] + m[4];
+			v[15] ^= v[ 3];
+			v[15] = ( v[15] << 32 ) | ( v[15] >>> 32 );
+			v[11] = v[11] + v[15];
+			v[ 7] ^= v[11];
+			v[ 7] = ( v[ 7] >>> 24 ) | ( v[ 7] << 40 );
+			v[ 3] = v[ 3] + v[ 7] + m[10];
+			v[15] ^= v[ 3];
+			v[15] = ( v[15] >>> 16 ) | ( v[15] << 48 );
+			v[11] = v[11] + v[15];
+			v[ 7] ^= v[11];
+			v[ 7] = ( v[ 7] << 1 ) | ( v[ 7] >>> 63 );
+
+			v[ 0] = v[ 0] + v[ 5] + m[0];
+			v[15] ^= v[ 0];
+			v[15] = ( v[15] << 32 ) | ( v[15] >>> 32 );
+			v[10] = v[10] + v[15];
+			v[ 5] ^= v[10];
+			v[ 5] = ( v[ 5] >>> 24 ) | ( v[ 5] << 40 );
+			v[ 0] = v[ 0] + v[ 5] + m[7];
+			v[15] ^= v[ 0];
+			v[15] = ( v[15] >>> 16 ) | ( v[15] << 48 );
+			v[10] = v[10] + v[15];
+			v[ 5] ^= v[10];
+			v[ 5] = ( v[ 5] << 1 ) | ( v[ 5] >>> 63 );
+
+			v[ 1] = v[ 1] + v[ 6] + m[6];
+			v[12] ^= v[ 1];
+			v[12] = ( v[12] << 32 ) | ( v[12] >>> 32 );
+			v[11] = v[11] + v[12];
+			v[ 6] ^= v[11];
+			v[ 6] = ( v[ 6] >>> 24 ) | ( v[ 6] << 40 );
+			v[ 1] = v[ 1] + v[ 6] + + m[3];
+			v[12] ^= v[ 1];
+			v[12] = ( v[12] >>> 16 ) | ( v[12] << 48 );
+			v[11] = v[11] + v[12];
+			v[ 6] ^= v[11];
+			v[ 6] = ( v[ 6] << 1 ) | ( v[ 6] >>> 63 );
+
+			v[ 2] = v[ 2] + v[ 7] + m[9];
+			v[13] ^= v[ 2];
+			v[13] = ( v[13] << 32 ) | ( v[13] >>> 32 );
+			v[ 8] = v[ 8] + v[13];
+			v[ 7] ^= v[ 8];
+			v[ 7] = ( v[ 7] >>> 24 ) | ( v[ 7] << 40 );
+			v[ 2] = v[ 2] + v[ 7] + m[2];
+			v[13] ^= v[ 2];
+			v[13] = ( v[13] >>> 16 ) | ( v[13] << 48 );
+			v[ 8] = v[ 8] + v[13];
+			v[ 7] ^= v[ 8];
+			v[ 7] = ( v[ 7] << 1 ) | ( v[ 7] >>> 63 );
+
+			v[ 3] = v[ 3] + v[ 4] + m[8];
+			v[14] ^= v[ 3];
+			v[14] = ( v[14] << 32 ) | ( v[14] >>> 32 );
+			v[ 9] = v[ 9] + v[14];
+			v[ 4] ^= v[ 9];
+			v[ 4] = ( v[ 4] >>> 24 ) | ( v[ 4] << 40 );
+			v[ 3] = v[ 3] + v[ 4] + m[11];
+			v[14] ^= v[ 3];
+			v[14] = ( v[14] >>> 16 ) | ( v[14] << 48 );
+			v[ 9] = v[ 9] + v[14];
+			v[ 4] ^= v[ 9];
+			v[ 4] = ( v[ 4] << 1 ) | ( v[ 4] >>> 63 );
+		}
+		private void round_7(final long[] v, final long[] m) {
+			v[ 0] = v[ 0] + v[ 4] + m[13];
+			v[12] ^= v[ 0];
+			v[12] = ( v[12] << 32 ) | ( v[12] >>> 32 );
+			v[ 8] = v[ 8] + v[12];
+			v[ 4] ^= v[ 8];
+			v[ 4] = ( v[ 4] >>> 24 ) | ( v[ 4] << 40 );
+			v[ 0] = v[ 0] + v[ 4] + m [11];
+			v[12] ^= v[ 0];
+			v[12] = ( v[12] >>> 16 ) | ( v[12] << 48 );
+			v[ 8] = v[ 8] + v[12];
+			v[ 4] ^= v[ 8];
+			v[ 4] = ( v[ 4] << 1 ) | ( v[ 4] >>> 63 );
+
+			v[ 1] = v[ 1] + v[ 5] + m[7];
+			v[13] ^= v[ 1];
+			v[13] = ( v[13] << 32 ) | ( v[13] >>> 32 );
+			v[ 9] = v[ 9] + v[13];
+			v[ 5] ^= v[ 9];
+			v[ 5] = ( v[ 5] >>> 24 ) | ( v[ 5] << 40 );
+			v[ 1] = v[ 1] + v[ 5] + m[14];
+			v[13] ^= v[ 1];
+			v[13] = ( v[13] >>> 16 ) | ( v[13] << 48 );
+			v[ 9] = v[ 9] + v[13];
+			v[ 5] ^= v[ 9];
+			v[ 5] = ( v[ 5] << 1 ) | ( v[ 5] >>> 63 );
+
+			v[ 2] = v[ 2] + v[ 6] + m[12];
+			v[14] ^= v[ 2];
+			v[14] = ( v[14] << 32 ) | ( v[14] >>> 32 );
+			v[10] = v[10] + v[14];
+			v[ 6] ^= v[10];
+			v[ 6] = ( v[ 6] >>> 24 ) | ( v[ 6] << 40 );
+			v[ 2] = v[ 2] + v[ 6] + m[1];
+			v[14] ^= v[ 2];
+			v[14] = ( v[14] >>> 16 ) | ( v[14] << 48 );
+			v[10] = v[10] + v[14];
+			v[ 6] ^= v[10];
+			v[ 6] = ( v[ 6] << 1 ) | ( v[ 6] >>> 63 );
+
+			v[ 3] = v[ 3] + v[ 7] + m[3];
+			v[15] ^= v[ 3];
+			v[15] = ( v[15] << 32 ) | ( v[15] >>> 32 );
+			v[11] = v[11] + v[15];
+			v[ 7] ^= v[11];
+			v[ 7] = ( v[ 7] >>> 24 ) | ( v[ 7] << 40 );
+			v[ 3] = v[ 3] + v[ 7] + m[9];
+			v[15] ^= v[ 3];
+			v[15] = ( v[15] >>> 16 ) | ( v[15] << 48 );
+			v[11] = v[11] + v[15];
+			v[ 7] ^= v[11];
+			v[ 7] = ( v[ 7] << 1 ) | ( v[ 7] >>> 63 );
+
+			v[ 0] = v[ 0] + v[ 5] + m[5];
+			v[15] ^= v[ 0];
+			v[15] = ( v[15] << 32 ) | ( v[15] >>> 32 );
+			v[10] = v[10] + v[15];
+			v[ 5] ^= v[10];
+			v[ 5] = ( v[ 5] >>> 24 ) | ( v[ 5] << 40 );
+			v[ 0] = v[ 0] + v[ 5] + m[0];
+			v[15] ^= v[ 0];
+			v[15] = ( v[15] >>> 16 ) | ( v[15] << 48 );
+			v[10] = v[10] + v[15];
+			v[ 5] ^= v[10];
+			v[ 5] = ( v[ 5] << 1 ) | ( v[ 5] >>> 63 );
+
+			v[ 1] = v[ 1] + v[ 6] + m[15];
+			v[12] ^= v[ 1];
+			v[12] = ( v[12] << 32 ) | ( v[12] >>> 32 );
+			v[11] = v[11] + v[12];
+			v[ 6] ^= v[11];
+			v[ 6] = ( v[ 6] >>> 24 ) | ( v[ 6] << 40 );
+			v[ 1] = v[ 1] + v[ 6] + + m[4];
+			v[12] ^= v[ 1];
+			v[12] = ( v[12] >>> 16 ) | ( v[12] << 48 );
+			v[11] = v[11] + v[12];
+			v[ 6] ^= v[11];
+			v[ 6] = ( v[ 6] << 1 ) | ( v[ 6] >>> 63 );
+
+			v[ 2] = v[ 2] + v[ 7] + m[8];
+			v[13] ^= v[ 2];
+			v[13] = ( v[13] << 32 ) | ( v[13] >>> 32 );
+			v[ 8] = v[ 8] + v[13];
+			v[ 7] ^= v[ 8];
+			v[ 7] = ( v[ 7] >>> 24 ) | ( v[ 7] << 40 );
+			v[ 2] = v[ 2] + v[ 7] + m[6];
+			v[13] ^= v[ 2];
+			v[13] = ( v[13] >>> 16 ) | ( v[13] << 48 );
+			v[ 8] = v[ 8] + v[13];
+			v[ 7] ^= v[ 8];
+			v[ 7] = ( v[ 7] << 1 ) | ( v[ 7] >>> 63 );
+
+			v[ 3] = v[ 3] + v[ 4] + m[2];
+			v[14] ^= v[ 3];
+			v[14] = ( v[14] << 32 ) | ( v[14] >>> 32 );
+			v[ 9] = v[ 9] + v[14];
+			v[ 4] ^= v[ 9];
+			v[ 4] = ( v[ 4] >>> 24 ) | ( v[ 4] << 40 );
+			v[ 3] = v[ 3] + v[ 4] + m[10];
+			v[14] ^= v[ 3];
+			v[14] = ( v[14] >>> 16 ) | ( v[14] << 48 );
+			v[ 9] = v[ 9] + v[14];
+			v[ 4] ^= v[ 9];
+			v[ 4] = ( v[ 4] << 1 ) | ( v[ 4] >>> 63 );
+		}
+		private void round_8(final long[] v, final long[] m) {
+			v[ 0] = v[ 0] + v[ 4] + m[6];
+			v[12] ^= v[ 0];
+			v[12] = ( v[12] << 32 ) | ( v[12] >>> 32 );
+			v[ 8] = v[ 8] + v[12];
+			v[ 4] ^= v[ 8];
+			v[ 4] = ( v[ 4] >>> 24 ) | ( v[ 4] << 40 );
+			v[ 0] = v[ 0] + v[ 4] + m [15];
+			v[12] ^= v[ 0];
+			v[12] = ( v[12] >>> 16 ) | ( v[12] << 48 );
+			v[ 8] = v[ 8] + v[12];
+			v[ 4] ^= v[ 8];
+			v[ 4] = ( v[ 4] << 1 ) | ( v[ 4] >>> 63 );
+
+			v[ 1] = v[ 1] + v[ 5] + m[14];
+			v[13] ^= v[ 1];
+			v[13] = ( v[13] << 32 ) | ( v[13] >>> 32 );
+			v[ 9] = v[ 9] + v[13];
+			v[ 5] ^= v[ 9];
+			v[ 5] = ( v[ 5] >>> 24 ) | ( v[ 5] << 40 );
+			v[ 1] = v[ 1] + v[ 5] + m[9];
+			v[13] ^= v[ 1];
+			v[13] = ( v[13] >>> 16 ) | ( v[13] << 48 );
+			v[ 9] = v[ 9] + v[13];
+			v[ 5] ^= v[ 9];
+			v[ 5] = ( v[ 5] << 1 ) | ( v[ 5] >>> 63 );
+
+			v[ 2] = v[ 2] + v[ 6] + m[11];
+			v[14] ^= v[ 2];
+			v[14] = ( v[14] << 32 ) | ( v[14] >>> 32 );
+			v[10] = v[10] + v[14];
+			v[ 6] ^= v[10];
+			v[ 6] = ( v[ 6] >>> 24 ) | ( v[ 6] << 40 );
+			v[ 2] = v[ 2] + v[ 6] + m[3];
+			v[14] ^= v[ 2];
+			v[14] = ( v[14] >>> 16 ) | ( v[14] << 48 );
+			v[10] = v[10] + v[14];
+			v[ 6] ^= v[10];
+			v[ 6] = ( v[ 6] << 1 ) | ( v[ 6] >>> 63 );
+
+			v[ 3] = v[ 3] + v[ 7] + m[0];
+			v[15] ^= v[ 3];
+			v[15] = ( v[15] << 32 ) | ( v[15] >>> 32 );
+			v[11] = v[11] + v[15];
+			v[ 7] ^= v[11];
+			v[ 7] = ( v[ 7] >>> 24 ) | ( v[ 7] << 40 );
+			v[ 3] = v[ 3] + v[ 7] + m[8];
+			v[15] ^= v[ 3];
+			v[15] = ( v[15] >>> 16 ) | ( v[15] << 48 );
+			v[11] = v[11] + v[15];
+			v[ 7] ^= v[11];
+			v[ 7] = ( v[ 7] << 1 ) | ( v[ 7] >>> 63 );
+
+			v[ 0] = v[ 0] + v[ 5] + m[12];
+			v[15] ^= v[ 0];
+			v[15] = ( v[15] << 32 ) | ( v[15] >>> 32 );
+			v[10] = v[10] + v[15];
+			v[ 5] ^= v[10];
+			v[ 5] = ( v[ 5] >>> 24 ) | ( v[ 5] << 40 );
+			v[ 0] = v[ 0] + v[ 5] + m[2];
+			v[15] ^= v[ 0];
+			v[15] = ( v[15] >>> 16 ) | ( v[15] << 48 );
+			v[10] = v[10] + v[15];
+			v[ 5] ^= v[10];
+			v[ 5] = ( v[ 5] << 1 ) | ( v[ 5] >>> 63 );
+
+			v[ 1] = v[ 1] + v[ 6] + m[13];
+			v[12] ^= v[ 1];
+			v[12] = ( v[12] << 32 ) | ( v[12] >>> 32 );
+			v[11] = v[11] + v[12];
+			v[ 6] ^= v[11];
+			v[ 6] = ( v[ 6] >>> 24 ) | ( v[ 6] << 40 );
+			v[ 1] = v[ 1] + v[ 6] + + m[7];
+			v[12] ^= v[ 1];
+			v[12] = ( v[12] >>> 16 ) | ( v[12] << 48 );
+			v[11] = v[11] + v[12];
+			v[ 6] ^= v[11];
+			v[ 6] = ( v[ 6] << 1 ) | ( v[ 6] >>> 63 );
+
+			v[ 2] = v[ 2] + v[ 7] + m[1];
+			v[13] ^= v[ 2];
+			v[13] = ( v[13] << 32 ) | ( v[13] >>> 32 );
+			v[ 8] = v[ 8] + v[13];
+			v[ 7] ^= v[ 8];
+			v[ 7] = ( v[ 7] >>> 24 ) | ( v[ 7] << 40 );
+			v[ 2] = v[ 2] + v[ 7] + m[4];
+			v[13] ^= v[ 2];
+			v[13] = ( v[13] >>> 16 ) | ( v[13] << 48 );
+			v[ 8] = v[ 8] + v[13];
+			v[ 7] ^= v[ 8];
+			v[ 7] = ( v[ 7] << 1 ) | ( v[ 7] >>> 63 );
+
+			v[ 3] = v[ 3] + v[ 4] + m[10];
+			v[14] ^= v[ 3];
+			v[14] = ( v[14] << 32 ) | ( v[14] >>> 32 );
+			v[ 9] = v[ 9] + v[14];
+			v[ 4] ^= v[ 9];
+			v[ 4] = ( v[ 4] >>> 24 ) | ( v[ 4] << 40 );
+			v[ 3] = v[ 3] + v[ 4] + m[5];
+			v[14] ^= v[ 3];
+			v[14] = ( v[14] >>> 16 ) | ( v[14] << 48 );
+			v[ 9] = v[ 9] + v[14];
+			v[ 4] ^= v[ 9];
+			v[ 4] = ( v[ 4] << 1 ) | ( v[ 4] >>> 63 );
+		}
+		private void round_9(final long[] v, final long[] m) {
+			v[ 0] = v[ 0] + v[ 4] + m[10];
+			v[12] ^= v[ 0];
+			v[12] = ( v[12] << 32 ) | ( v[12] >>> 32 );
+			v[ 8] = v[ 8] + v[12];
+			v[ 4] ^= v[ 8];
+			v[ 4] = ( v[ 4] >>> 24 ) | ( v[ 4] << 40 );
+			v[ 0] = v[ 0] + v[ 4] + m [2];
+			v[12] ^= v[ 0];
+			v[12] = ( v[12] >>> 16 ) | ( v[12] << 48 );
+			v[ 8] = v[ 8] + v[12];
+			v[ 4] ^= v[ 8];
+			v[ 4] = ( v[ 4] << 1 ) | ( v[ 4] >>> 63 );
+
+			v[ 1] = v[ 1] + v[ 5] + m[8];
+			v[13] ^= v[ 1];
+			v[13] = ( v[13] << 32 ) | ( v[13] >>> 32 );
+			v[ 9] = v[ 9] + v[13];
+			v[ 5] ^= v[ 9];
+			v[ 5] = ( v[ 5] >>> 24 ) | ( v[ 5] << 40 );
+			v[ 1] = v[ 1] + v[ 5] + m[4];
+			v[13] ^= v[ 1];
+			v[13] = ( v[13] >>> 16 ) | ( v[13] << 48 );
+			v[ 9] = v[ 9] + v[13];
+			v[ 5] ^= v[ 9];
+			v[ 5] = ( v[ 5] << 1 ) | ( v[ 5] >>> 63 );
+
+			v[ 2] = v[ 2] + v[ 6] + m[7];
+			v[14] ^= v[ 2];
+			v[14] = ( v[14] << 32 ) | ( v[14] >>> 32 );
+			v[10] = v[10] + v[14];
+			v[ 6] ^= v[10];
+			v[ 6] = ( v[ 6] >>> 24 ) | ( v[ 6] << 40 );
+			v[ 2] = v[ 2] + v[ 6] + m[6];
+			v[14] ^= v[ 2];
+			v[14] = ( v[14] >>> 16 ) | ( v[14] << 48 );
+			v[10] = v[10] + v[14];
+			v[ 6] ^= v[10];
+			v[ 6] = ( v[ 6] << 1 ) | ( v[ 6] >>> 63 );
+
+			v[ 3] = v[ 3] + v[ 7] + m[1];
+			v[15] ^= v[ 3];
+			v[15] = ( v[15] << 32 ) | ( v[15] >>> 32 );
+			v[11] = v[11] + v[15];
+			v[ 7] ^= v[11];
+			v[ 7] = ( v[ 7] >>> 24 ) | ( v[ 7] << 40 );
+			v[ 3] = v[ 3] + v[ 7] + m[5];
+			v[15] ^= v[ 3];
+			v[15] = ( v[15] >>> 16 ) | ( v[15] << 48 );
+			v[11] = v[11] + v[15];
+			v[ 7] ^= v[11];
+			v[ 7] = ( v[ 7] << 1 ) | ( v[ 7] >>> 63 );
+
+			v[ 0] = v[ 0] + v[ 5] + m[15];
+			v[15] ^= v[ 0];
+			v[15] = ( v[15] << 32 ) | ( v[15] >>> 32 );
+			v[10] = v[10] + v[15];
+			v[ 5] ^= v[10];
+			v[ 5] = ( v[ 5] >>> 24 ) | ( v[ 5] << 40 );
+			v[ 0] = v[ 0] + v[ 5] + m[11];
+			v[15] ^= v[ 0];
+			v[15] = ( v[15] >>> 16 ) | ( v[15] << 48 );
+			v[10] = v[10] + v[15];
+			v[ 5] ^= v[10];
+			v[ 5] = ( v[ 5] << 1 ) | ( v[ 5] >>> 63 );
+
+			v[ 1] = v[ 1] + v[ 6] + m[9];
+			v[12] ^= v[ 1];
+			v[12] = ( v[12] << 32 ) | ( v[12] >>> 32 );
+			v[11] = v[11] + v[12];
+			v[ 6] ^= v[11];
+			v[ 6] = ( v[ 6] >>> 24 ) | ( v[ 6] << 40 );
+			v[ 1] = v[ 1] + v[ 6] + + m[14];
+			v[12] ^= v[ 1];
+			v[12] = ( v[12] >>> 16 ) | ( v[12] << 48 );
+			v[11] = v[11] + v[12];
+			v[ 6] ^= v[11];
+			v[ 6] = ( v[ 6] << 1 ) | ( v[ 6] >>> 63 );
+
+			v[ 2] = v[ 2] + v[ 7] + m[3];
+			v[13] ^= v[ 2];
+			v[13] = ( v[13] << 32 ) | ( v[13] >>> 32 );
+			v[ 8] = v[ 8] + v[13];
+			v[ 7] ^= v[ 8];
+			v[ 7] = ( v[ 7] >>> 24 ) | ( v[ 7] << 40 );
+			v[ 2] = v[ 2] + v[ 7] + m[12];
+			v[13] ^= v[ 2];
+			v[13] = ( v[13] >>> 16 ) | ( v[13] << 48 );
+			v[ 8] = v[ 8] + v[13];
+			v[ 7] ^= v[ 8];
+			v[ 7] = ( v[ 7] << 1 ) | ( v[ 7] >>> 63 );
+
+			v[ 3] = v[ 3] + v[ 4] + m[13];
+			v[14] ^= v[ 3];
+			v[14] = ( v[14] << 32 ) | ( v[14] >>> 32 );
+			v[ 9] = v[ 9] + v[14];
+			v[ 4] ^= v[ 9];
+			v[ 4] = ( v[ 4] >>> 24 ) | ( v[ 4] << 40 );
+			v[ 3] = v[ 3] + v[ 4] + m[0];
+			v[14] ^= v[ 3];
+			v[14] = ( v[14] >>> 16 ) | ( v[14] << 48 );
+			v[ 9] = v[ 9] + v[14];
+			v[ 4] ^= v[ 9];
+			v[ 4] = ( v[ 4] << 1 ) | ( v[ 4] >>> 63 );
+		}
+
+		////////////////////////////////////////////////////////////////////////
+		/// Compression Kernel //////////////////////////////////////////// FINI
+		////////////////////////////////////////////////////////////////////////
+
+		/* TEMP - remove at will */
+		public static class Debug {
+			public static void dumpState (Engine e, final String mark) {
+				System.out.format("-- MARK == @ %s @ ===========\n", mark);
+				dumpArray("register t", e.state.t);
+				dumpArray("register h", e.state.h);
+				dumpArray("register f", e.state.f);
+				dumpArray("register offset", new long[]{e.state.buflen});
+				System.out.format("-- END MARK =================\n");
+			}
+			public static void dumpArray (final String label, final long[] b) {
+				System.out.format ( "-- %s -- :\n{\n", label );
+				for( int j = 0; j < b.length ; ++j ) {
+					System.out.format ( "    [%2d] : %016X\n", j, b[j]);
+				}
+				System.out.format ( "}\n" );
+			}
+			public static void dumpBuffer (final PrintStream out, final String label, final byte[] b) {
+				dumpBuffer(out, label, b, 0, b.length);
+			}
+			public static void dumpBuffer (final PrintStream out, final byte[] b) {
+				dumpBuffer(out, null, b, 0, b.length);
+			}
+			public static void dumpBuffer (final PrintStream out, final byte[] b, final int offset, final int len) {
+				dumpBuffer(out, null, b, offset, len);
+			}
+			public static void dumpBuffer (final PrintStream out, final String label, final byte[] b, final int offset, final int len) {
+				if(label != null)
+					out.format ( "-- %s -- :\n", label );
+				out.format("{\n    ", label);
+				for( int j = 0; j < len ; ++j ) {
+					out.format ("%02X", b[j + offset]);
+					if(j+1 < len) {
+						if ((j+1)%8==0) out.print("\n    ");
+						else out.print(' ');
+					}
+				}
+				out.format("\n}\n");
+			}
+		}
+		/* TEMP - remove at will */
+
+		// ---------------------------------------------------------------------
+		// Helper for assert error messages
+		// ---------------------------------------------------------------------
+		public static final class Assert {
+			public final static String exclusiveUpperBound = "'%s' %d is >= %d";
+			public final static String inclusiveUpperBound = "'%s' %d is > %d";
+			public final static String exclusiveLowerBound = "'%s' %d is <= %d";
+			public final static String inclusiveLowerBound = "'%s' %d is < %d";
+			static <T extends Number> String assertFail(final String name, final T v, final String err, final T spec) {
+				new Exception().printStackTrace();
+				return String.format(err, name, v, spec);
+			}
+		}
+		// ---------------------------------------------------------------------
+		// Little Endian Codecs (inlined in the compressor)
+		/*
+		 * impl note: these are not library funcs and used in hot loops, so no
+		 * null or bounds checks are performed. For our purposes, this is OK.
+		 */
+		// ---------------------------------------------------------------------
+
+		public static class LittleEndian {
+			private static final byte[] hex_digits = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+			private static final byte[] HEX_digits = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+			/** @return hex rep of byte (lower case). */
+			static public String toHexStr (final byte[] b) {
+				return toHexStr (b, false); // because String class is slower.
+			}
+			static public String toHexStr (final byte[] b, boolean upperCase) {
+				final int len = b.length;
+				final byte[] digits = new byte[ len * 2 ];
+				final byte[] hex_rep = upperCase ? HEX_digits : hex_digits ;
+				for (int i = 0; i < len; i++) {
+					digits [ i*2   ] = hex_rep [ (byte) (b[i] >> 4 & 0x0F)  ];
+					digits [ i*2+1 ] = hex_rep [ (byte) (b[i]      & 0x0F) ];
+				}
+				return new String(digits);
+			}
+			public static int readInt (final byte[] b, final int off) {
+				int v0 = ((int)b [ off ] & 0xFF );
+				v0 |= ((int)b [ off + 1 ] & 0xFF ) <<  8;
+				v0 |= ((int)b [ off + 2 ] & 0xFF ) << 16;
+				return v0 | ((int)b [ off + 3 ]  ) << 24;
+			}
+			/** Little endian - byte[] to long */
+			public static long readLong (final byte[] b, final int off) {
+				long v0 = ((long)b [ off ] & 0xFF );
+				v0 |= ((long)b [ off + 1 ] & 0xFF ) <<  8;
+				v0 |= ((long)b [ off + 2 ] & 0xFF ) << 16;
+				v0 |= ((long)b [ off + 3 ] & 0xFF ) << 24;
+				v0 |= ((long)b [ off + 4 ] & 0xFF ) << 32;
+				v0 |= ((long)b [ off + 5 ] & 0xFF ) << 40;
+				v0 |= ((long)b [ off + 6 ] & 0xFF ) << 48;
+				return v0 | ((long)b [ off + 7 ] )  << 56;
+			}
+			/** Little endian - long to byte[] */
+			public static void writeLong (long v, final byte[] b, final int off) {
+				b [ off ]     = (byte) v; v >>>= 8;
+				b [ off + 1 ] = (byte) v; v >>>= 8;
+				b [ off + 2 ] = (byte) v; v >>>= 8;
+				b [ off + 3 ] = (byte) v; v >>>= 8;
+				b [ off + 4 ] = (byte) v; v >>>= 8;
+				b [ off + 5 ] = (byte) v; v >>>= 8;
+				b [ off + 6 ] = (byte) v; v >>>= 8;
+				b [ off + 7 ] = (byte) v;
+			}
+			/** Little endian - int to byte[] */
+			public static void writeInt (int v, final byte[] b, final int off) {
+				b [ off ]     = (byte) v; v >>>= 8;
+				b [ off + 1 ] = (byte) v; v >>>= 8;
+				b [ off + 2 ] = (byte) v; v >>>= 8;
+				b [ off + 3 ] = (byte) v;
+			}
+		}
+	}
+	// ---------------------------------------------------------------------
+	// digest parameter (block)
+	// ---------------------------------------------------------------------
+	/** Blake2b configuration parameters block per spec */
+	// REVU: need to review a revert back to non-lazy impl TODO: do & bench
+	public static class Param implements AlgorithmParameterSpec {
+		interface Xoff {
+			int digest_length   = 0;
+			int key_length      = 1;
+			int fanout          = 2;
+			int depth           = 3;
+			int leaf_length     = 4;
+			int node_offset     = 8;
+			int node_depth      = 16;
+			int inner_length    = 17;
+			int reserved        = 18;
+			int salt            = 32;
+			int personal        = 48;
+		}
+		public interface Default {
+			byte    digest_length   = Spec.max_digest_bytes;
+			byte    key_length      = 0;
+			byte    fanout          = 1;
+			byte    depth           = 1;
+			int     leaf_length     = 0;
+			long    node_offset     = 0;
+			byte    node_depth      = 0;
+			byte    inner_length    = 0;
+		}
+		/** default bytes of Blake2b parameter block */
+		final static byte[] default_bytes = new byte[ Spec.param_bytes ];
+		/** initialize default_bytes */
+		static {
+			default_bytes [ Xoff.digest_length ] = Default.digest_length;
+			default_bytes [ Xoff.key_length ] = Default.key_length;
+			default_bytes [ Xoff.fanout ] = Default.fanout;
+			default_bytes [ Xoff.depth ] = Default.depth;
+			/* def. leaf_length is 0 fill and already set by new byte[] */
+			/* def. node_offset is 0 fill and already set by new byte[] */
+			default_bytes [ Xoff.node_depth ] = Default.node_depth;
+			default_bytes [ Xoff.inner_length] = Default.inner_length;
+			/* def. salt is 0 fill and already set by new byte[] */
+			/* def. personal is 0 fill and already set by new byte[] */
+		}
+		/** default Blake2b h vector */
+		final static long[] default_h = new long [ Spec.state_space_len ];
+		static {
+			default_h [0] = readLong( default_bytes, 0  );
+			default_h [1] = readLong( default_bytes, 8  );
+			default_h [2] = readLong( default_bytes, 16 );
+			default_h [3] = readLong( default_bytes, 24 );
+			default_h [4] = readLong( default_bytes, 32 );
+			default_h [5] = readLong( default_bytes, 40 );
+			default_h [6] = readLong( default_bytes, 48 );
+			default_h [7] = readLong( default_bytes, 56 );
+
+			default_h [0] ^= Spec.IV [0];
+			default_h [1] ^= Spec.IV [1];
+			default_h [2] ^= Spec.IV [2];
+			default_h [3] ^= Spec.IV [3];
+			default_h [4] ^= Spec.IV [4];
+			default_h [5] ^= Spec.IV [5];
+			default_h [6] ^= Spec.IV [6];
+			default_h [7] ^= Spec.IV [7];
+		}
+
+		/** */
+		private boolean hasKey = false;
+		/** not sure how to make this secure - TODO */
+		private byte[] key_bytes = null;
+		/** */
+		private byte[] bytes = null;
+		/** */
+		private  final long[] h = new long [ Spec.state_space_len ];
+
+		/** */
+		public Param() {
+			System.arraycopy( default_h, 0, h, 0, Spec.state_space_len );
+		}
+		/** */
+		public long[] initialized_H () {
+			return h;
+		}
+		/** package only - copy returned - do not use in functional loops */
+		public byte[] getBytes() {
+			lazyInitBytes();
+			byte[] copy = new byte[ bytes.length ];
+			System.arraycopy( bytes, 0, copy, 0, bytes.length );
+			return copy;
+		}
+
+		final byte getByteParam (final int xoffset) {
+			byte[] _bytes = bytes;
+			if(_bytes == null) _bytes = Param.default_bytes;
+			return _bytes[ xoffset];
+		}
+		final int getIntParam (final int xoffset) {
+			byte[] _bytes = bytes;
+			if(_bytes == null) _bytes = Param.default_bytes;
+			return readInt ( _bytes, xoffset);
+		}
+		final long getLongParam (final int xoffset) {
+			byte[] _bytes = bytes;
+			if(_bytes == null) _bytes = Param.default_bytes;
+			return readLong ( _bytes, xoffset);
+		}
+		// TODO same for tree params depth, fanout, inner, node-depth, node-offset
+		public final int getDigestLength() {
+			return (int) getByteParam ( Xoff.digest_length );
+		}
+		public final int getKeyLength() {
+			return (int) getByteParam ( Xoff.key_length );
+		}
+		public final int getFanout() {
+			return (int) getByteParam ( Xoff.fanout );
+		}
+		public final int getDepth() {
+			return (int) getByteParam ( Xoff.depth );
+		}
+		public final int getLeafLength() {
+			return getIntParam ( Xoff.leaf_length );
+		}
+		public final long getNodeOffset() {
+			return getLongParam ( Xoff.node_offset );
+		}
+		public final int getNodeDepth() {
+			return (int) getByteParam ( Xoff.node_depth );
+		}
+		public final int getInnerLength() {
+			return (int) getByteParam ( Xoff.inner_length );
+		}
+
+		public final boolean hasKey() { return this.hasKey; }
+
+		@Override public Param clone() {
+			final Param clone = new Param();
+			System.arraycopy(this.h, 0, clone.h, 0, h.length);
+			clone.lazyInitBytes();
+			System.arraycopy(this.bytes, 0, clone.bytes, 0, this.bytes.length);
+
+			if(this.hasKey){
+				clone.hasKey = this.hasKey;
+				clone.key_bytes = new byte [Spec.max_key_bytes * 2];
+				System.arraycopy(this.key_bytes, 0, clone.key_bytes, 0, this.key_bytes.length);
+			}
+			return clone;
+		}
+		////////////////////////////////////////////////////////////////////////
+		/// lazy setters - write directly to the bytes image of param block ////
+		////////////////////////////////////////////////////////////////////////
+		final void lazyInitBytes () {
+			if( bytes == null ) {
+				bytes = new byte [ Spec.param_bytes ];
+				System.arraycopy(Param.default_bytes, 0, bytes, 0, Spec.param_bytes);
+			}
+		}
+		/* 0-7 inclusive */
+		public final Param setDigestLength(int len) {
+			assert len > 0 : assertFail("len", len, exclusiveLowerBound, 0);
+			assert len <= Spec.max_digest_bytes : assertFail("len", len, inclusiveUpperBound, Spec.max_digest_bytes);
+
+			lazyInitBytes();
+			bytes[ Xoff.digest_length ] = (byte) len;
+			h[ 0 ] = readLong( bytes, 0  );
+			h[ 0 ] ^= Spec.IV [ 0 ];
+			return this;
+		}
+		public final Param setKey (final Key key) {
+			assert key != null : "key is null";
+			final byte[] keybytes = key.getEncoded();
+			assert keybytes != null : "key.encoded() is null";
+
+			return this.setKey(keybytes);
+		}
+		public final Param setKey (final byte[] key) {
+			assert key != null : "key is null";
+			assert key.length >= 0 : assertFail("key.length", key.length, inclusiveUpperBound, 0);
+			assert key.length <= Spec.max_key_bytes : assertFail("key.length", key.length, inclusiveUpperBound, Spec.max_key_bytes);
+
+			// zeropad keybytes
+			this.key_bytes = new byte [Spec.max_key_bytes * 2];
+			System.arraycopy ( key, 0, this.key_bytes, 0, key.length );
+			lazyInitBytes();
+			bytes[ Xoff.key_length ] = (byte) key.length; // checked c ref; this is correct
+			h[ 0 ] = readLong( bytes, 0  );
+			h[ 0 ] ^= Spec.IV [ 0 ];
+			this.hasKey  = true;
+			return this;
+		}
+		public final Param setFanout(int fanout) {
+			assert fanout > 0 : assertFail("fanout", fanout, exclusiveLowerBound, 0);
+
+			lazyInitBytes();
+			bytes[ Xoff.fanout ] = (byte) fanout;
+			h[ 0 ] = readLong( bytes, 0  );
+			h[ 0 ] ^= Spec.IV [ 0 ];
+			return this;
+		}
+		public final Param setDepth(int depth) {
+			assert depth > 0 : assertFail("depth", depth, exclusiveLowerBound, 0);
+
+			lazyInitBytes();
+			bytes[ Xoff.depth ] = (byte) depth;
+			h[ 0 ] = readLong( bytes, 0  );
+			h[ 0 ] ^= Spec.IV [ 0 ];
+			return this;
+		}
+		public final Param setLeafLength(int leaf_length) {
+			assert leaf_length >= 0 : assertFail("leaf_length", leaf_length, inclusiveLowerBound, 0);
+
+			lazyInitBytes();
+			writeInt (leaf_length, bytes, Xoff.leaf_length);
+			h[ 0 ] = readLong( bytes, 0  );
+			h[ 0 ] ^= Spec.IV [ 0 ];
+			return this;
+		}
+
+		/* 8-15 inclusive */
+		public final Param setNodeOffset(long node_offset) {
+			assert node_offset >= 0 : assertFail("node_offset", node_offset, inclusiveLowerBound, 0);
+
+			lazyInitBytes();
+			writeLong(node_offset, bytes, Xoff.node_offset);
+			h[ 1 ] = readLong( bytes, Xoff.node_offset );
+			h[ 1 ] ^= Spec.IV [ 1 ];
+			return this;
+		}
+
+		/* 16-23 inclusive */
+		public final Param setNodeDepth(int node_depth) {
+			assert node_depth >= 0 : assertFail("node_depth", node_depth, inclusiveLowerBound, 0);
+
+			lazyInitBytes();
+			bytes[ Xoff.node_depth ] = (byte) node_depth;
+			h[ 2 ] = readLong( bytes, Xoff.node_depth );
+			h[ 2 ] ^= Spec.IV [ 2 ];
+			h[ 3 ] = readLong( bytes, Xoff.node_depth + 8);
+			h[ 3 ] ^= Spec.IV [ 3 ];
+			return this;
+		}
+		public final Param setInnerLength(int inner_length) {
+			assert inner_length >= 0 : assertFail("inner_length", inner_length, inclusiveLowerBound, 0);
+
+			lazyInitBytes();
+			bytes[ Xoff.inner_length] = (byte) inner_length;
+			h[ 2 ] = readLong( bytes, Xoff.node_depth );
+			h[ 2 ] ^= Spec.IV [ 2 ];
+			h[ 3 ] = readLong( bytes, Xoff.node_depth + 8);
+			h[ 3 ] ^= Spec.IV [ 3 ];
+			return this;
+		}
+
+		/* 24-31 masked by reserved and remain unchanged */
+
+		/* 32-47 inclusive */
+		public final Param setSalt(final byte[] salt) {
+			assert salt != null : "salt is null";
+			assert salt.length <= Spec.max_salt_bytes : assertFail("salt.length", salt.length, inclusiveUpperBound, Spec.max_salt_bytes);
+
+			lazyInitBytes();
+			Arrays.fill ( bytes, Xoff.salt, Xoff.salt + Spec.max_salt_bytes, (byte)0);
+			System.arraycopy( salt, 0, bytes, Xoff.salt, salt.length );
+			h[ 4 ] = readLong( bytes, Xoff.salt );
+			h[ 4 ] ^= Spec.IV [ 4 ];
+			h[ 5 ] = readLong( bytes, Xoff.salt + 8 );
+			h[ 5 ] ^= Spec.IV [ 5 ];
+			return this;
+		}
+
+		/* 48-63 inclusive */
+		public final Param setPersonal(byte[] personal) {
+			assert personal != null : "personal is null";
+			assert personal.length <= Spec.max_personalization_bytes : assertFail("personal.length", personal.length, inclusiveUpperBound, Spec.max_personalization_bytes);
+
+			lazyInitBytes();
+			Arrays.fill ( bytes, Xoff.personal, Xoff.personal + Spec.max_personalization_bytes, (byte)0);
+			System.arraycopy( personal, 0, bytes, Xoff.personal, personal.length );
+			h[ 6 ] = readLong( bytes, Xoff.personal );
+			h[ 6 ] ^= Spec.IV [ 6 ];
+			h[ 7 ] = readLong( bytes, Xoff.personal + 8 );
+			h[ 7 ] ^= Spec.IV [ 7 ];
+			return this;
+		}
+		////////////////////////////////////////////////////////////////////////
+		/// lazy setters /////////////////////////////////////////////////// END
+		////////////////////////////////////////////////////////////////////////
+	}
+}
diff --git a/blockchain/src/main/java/com/tangem/blockchain/cardano/network/CardanoNetworkManager.kt b/blockchain/src/main/java/com/tangem/blockchain/cardano/network/CardanoNetworkManager.kt
new file mode 100644
index 0000000000..1852c6b994
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/cardano/network/CardanoNetworkManager.kt
@@ -0,0 +1,67 @@
+package com.tangem.blockchain.cardano.network
+
+import com.tangem.blockchain.cardano.UnspentOutput
+import com.tangem.blockchain.cardano.network.adalite.AdaliteProvider
+import com.tangem.blockchain.cardano.network.api.AdaliteApi
+import com.tangem.blockchain.common.extensions.Result
+import com.tangem.blockchain.common.extensions.SimpleResult
+import com.tangem.blockchain.common.network.API_ADALITE
+import com.tangem.blockchain.common.network.API_ADALITE_RESERVE
+import com.tangem.blockchain.common.network.createRetrofitInstance
+import retrofit2.HttpException
+import java.io.IOException
+
+class CardanoNetworkManager {
+    private val adaliteProvider by lazy {
+        val api = createRetrofitInstance(API_ADALITE)
+                .create(AdaliteApi::class.java)
+        AdaliteProvider(api)
+    }
+
+    private val adaliteReserveProvider by lazy {
+        val api = createRetrofitInstance(API_ADALITE_RESERVE)
+                .create(AdaliteApi::class.java)
+        AdaliteProvider(api)
+    }
+
+    private var provider = adaliteProvider
+
+    private fun changeProvider() {
+        provider = if (provider == adaliteProvider) adaliteReserveProvider else adaliteProvider
+    }
+
+    suspend fun getInfo(address: String): Result<CardanoAddressResponse> {
+        val result = provider.getInfo(address)
+        when (result) {
+            is Result.Success -> return result
+            is Result.Failure -> {
+                if (result.error is IOException || result.error is HttpException) {
+                    changeProvider()
+                    return provider.getInfo(address)
+                } else {
+                    return result
+                }
+            }
+        }
+    }
+
+    suspend fun sendTransaction(transaction: String): SimpleResult {
+        val result = provider.sendTransaction(transaction)
+        when (result) {
+            is SimpleResult.Success -> return result
+            is SimpleResult.Failure -> {
+                if (result.error is IOException || result.error is HttpException) {
+                    changeProvider()
+                    return provider.sendTransaction(transaction)
+                } else {
+                    return result
+                }
+            }
+        }
+    }
+}
+
+data class CardanoAddressResponse(
+        val balance: Long,
+        val unspentOutputs: List<UnspentOutput>
+)
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/cardano/network/adalite/AdaliteApi.kt b/blockchain/src/main/java/com/tangem/blockchain/cardano/network/adalite/AdaliteApi.kt
new file mode 100644
index 0000000000..e394d424f6
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/cardano/network/adalite/AdaliteApi.kt
@@ -0,0 +1,20 @@
+package com.tangem.blockchain.cardano.network.api
+
+import com.tangem.blockchain.cardano.network.adalite.AdaliteAddress
+import com.tangem.blockchain.cardano.network.adalite.AdaliteSendBody
+import com.tangem.blockchain.cardano.network.adalite.AdaliteUnspents
+import retrofit2.http.*
+import shadow.okhttp3.ResponseBody
+
+interface AdaliteApi {
+    @GET("/api/addresses/summary/{address}")
+    suspend fun getAddress(@Path("address") address: String): AdaliteAddress
+
+    @Headers("Content-Type: application/json")
+    @POST("/api/bulk/addresses/utxo")
+    suspend fun getUnspents(@Body address: String): AdaliteUnspents
+
+    @Headers("Content-Type: application/json")
+    @POST("/api/v2/txs/signed")
+    suspend fun sendTransaction(@Body adaliteBody: AdaliteSendBody): ResponseBody // List<Any>?
+}
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/cardano/network/adalite/AdaliteProvider.kt b/blockchain/src/main/java/com/tangem/blockchain/cardano/network/adalite/AdaliteProvider.kt
new file mode 100644
index 0000000000..ec05798ced
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/cardano/network/adalite/AdaliteProvider.kt
@@ -0,0 +1,53 @@
+package com.tangem.blockchain.cardano.network.adalite
+
+import com.tangem.blockchain.cardano.network.CardanoAddressResponse
+import com.tangem.blockchain.cardano.UnspentOutput
+import com.tangem.blockchain.cardano.network.api.AdaliteApi
+import com.tangem.blockchain.common.extensions.Result
+import com.tangem.blockchain.common.extensions.SimpleResult
+import com.tangem.blockchain.common.extensions.retryIO
+import kotlinx.coroutines.async
+import kotlinx.coroutines.coroutineScope
+
+class AdaliteProvider(private val api: AdaliteApi) {
+
+    suspend fun getInfo(address: String): Result<CardanoAddressResponse> {
+        return try {
+            coroutineScope {
+                val addressDeferred = retryIO { async { api.getAddress(address) } }
+                val unspentsDeferred = retryIO { async { api.getUnspents(address) } }
+
+                val addressData = addressDeferred.await()
+                val unspents = unspentsDeferred.await()
+
+                val cardanoUnspents = unspents.data.map {
+                    UnspentOutput(
+                            it.amountData!!.amount!!,
+                            it.outputIndex!!.toLong(),
+                            it.hash!!.toByteArray()
+                    )
+                }
+
+                Result.Success(
+                        CardanoAddressResponse(
+                                addressData.data!!.balanceData!!.amount!!,
+                                cardanoUnspents
+                        )
+                )
+            }
+        } catch (exception: Exception) {
+            Result.Failure(exception)
+        }
+    }
+
+    suspend fun sendTransaction(transaction: String): SimpleResult {
+        return try {
+            retryIO { api.sendTransaction(AdaliteSendBody(transaction)) }
+            SimpleResult.Success
+        } catch (exception: Exception) {
+            SimpleResult.Failure(exception)
+        }
+    }
+}
+
+data class AdaliteSendBody(val signedTransaction: String)
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/cardano/network/adalite/AdaliteResponse.kt b/blockchain/src/main/java/com/tangem/blockchain/cardano/network/adalite/AdaliteResponse.kt
new file mode 100644
index 0000000000..4bc1f86894
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/cardano/network/adalite/AdaliteResponse.kt
@@ -0,0 +1,49 @@
+package com.tangem.blockchain.cardano.network.adalite
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class AdaliteAddress(
+        @Json(name = "final_balance")
+        var data: AdaliteAddressData? = null
+)
+
+@JsonClass(generateAdapter = true)
+data class AdaliteAddressData(
+        @Json(name = "caBalance")
+        var balanceData: BalanceData? = null
+
+//        @Json(name = "caTxList")
+//        var transactions: List<AdaliteTransaction>
+)
+
+@JsonClass(generateAdapter = true)
+data class BalanceData(
+        @Json(name = "getCoin")
+        var amount: Long? = null
+)
+
+@JsonClass(generateAdapter = true)
+data class AdaliteUnspents(
+        @Json(name = "Right")
+        var data: List<AdaliteUtxo>
+)
+
+@JsonClass(generateAdapter = true)
+data class AdaliteUtxo(
+        @Json(name = "cuId")
+        var hash: String? = null,
+
+        @Json(name = "cuOutIndex")
+        var outputIndex: Int? = null,
+
+        @Json(name = "cuCoins")
+        var amountData: BalanceData? = null
+)
+
+//@JsonClass(generateAdapter = true)
+//data class AdaliteTransaction(
+//        @Json(name = "ctbId")
+//        var hash: String? = null
+//)
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/common/Blockchain.kt b/blockchain/src/main/java/com/tangem/blockchain/common/Blockchain.kt
new file mode 100644
index 0000000000..ac90c477bd
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/common/Blockchain.kt
@@ -0,0 +1,74 @@
+package com.tangem.blockchain.common
+
+import com.tangem.blockchain.bitcoin.BitcoinAddressFactory
+import com.tangem.blockchain.bitcoin.BitcoinAddressValidator
+import com.tangem.blockchain.ethereum.EthereumAddressFactory
+import com.tangem.blockchain.ethereum.EthereumAddressValidator
+import com.tangem.blockchain.cardano.CardanoAddressFactory
+import com.tangem.blockchain.cardano.CardanoAddressValidator
+import com.tangem.blockchain.stellar.StellarAddressFactory
+import com.tangem.blockchain.xrp.XrpAddressFactory
+import com.tangem.blockchain.xrp.XrpAddressValidator
+import java.math.BigDecimal
+
+enum class Blockchain(
+        val id: String,
+        val currency: String,
+        val decimals: Byte,
+        val fullName: String,
+        val pendingTransactionTimeout: Int
+) {
+    Unknown("", "", 0, "", 0),
+    Bitcoin("BTC", "BTC", 8, "Bitcoin", 0),
+    BitcoinTestnet("BTC", "BTC", 8, "Bitcoin Testnet", 0),
+    Ethereum("ETH", "ETH", 18, "Ethereum", 0),
+    Rootstock("", "", 18, "", 0),
+    Cardano("CARDANO", "ADA", 6, "Cardano", 0),
+    XRP("", "XRP", 6, "XRP Ledger", 0),
+    Binance("", "", 8, "", 0),
+    Stellar("XLM", "XLM", 7, "Stellar", 0);
+
+    fun roundingMode(): Int = when (this) {
+        Bitcoin, Ethereum, Rootstock, Binance -> BigDecimal.ROUND_DOWN
+        Cardano -> BigDecimal.ROUND_UP
+        else -> BigDecimal.ROUND_HALF_UP
+    }
+
+    fun makeAddress(walletPublicKey: ByteArray): String {
+        return when (this) {
+            Unknown -> throw Exception("unsupported blockchain")
+            Bitcoin -> BitcoinAddressFactory.makeAddress(walletPublicKey)
+            BitcoinTestnet -> BitcoinAddressFactory.makeAddress(walletPublicKey, testNet = true)
+            Ethereum -> EthereumAddressFactory.makeAddress(walletPublicKey)
+//            Rootstock -> RootstockAddressFactory.makeAddress(cardPublicKey)
+            Cardano -> CardanoAddressFactory.makeAddress(walletPublicKey)
+            XRP -> XrpAddressFactory.makeAddress(walletPublicKey)
+//            Binance -> BinanceAddressFactory.makeAddress(cardPublicKey)
+            Stellar -> StellarAddressFactory.makeAddress(walletPublicKey)
+            else -> throw Exception("unsupported blockchain")
+        }
+    }
+
+    fun validateAddress(address: String): Boolean {
+        return when (this) {
+            Unknown -> throw Exception("unsupported blockchain")
+            Bitcoin -> BitcoinAddressValidator.validate(address)
+            BitcoinTestnet -> BitcoinAddressValidator.validate(address, testNet = true)
+            Ethereum -> EthereumAddressValidator.validate(address)
+//            Rootstock -> RootstockAddressValidator.validate(address)
+            Cardano -> CardanoAddressValidator.validate(address)
+            XRP -> XrpAddressValidator.validate(address)
+//            Binance -> BinanceAddressValidator.validate(address)
+//            Stellar -> StellarAddressValidator.validate(address)
+            else -> throw Exception("unsupported blockchain")
+        }
+    }
+
+    companion object {
+        private val values = values()
+        fun fromId(id: String): Blockchain = values.find { it.id == id } ?: Unknown
+        fun fromName(name: String): Blockchain = values.find { it.name == name } ?: Unknown
+        fun fromCurrency(currency: String): Blockchain = values.find { it.currency == currency }
+                ?: Unknown
+    }
+}
diff --git a/blockchain/src/main/java/com/tangem/blockchain/common/Wallet.kt b/blockchain/src/main/java/com/tangem/blockchain/common/Wallet.kt
new file mode 100644
index 0000000000..68f9855e05
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/common/Wallet.kt
@@ -0,0 +1,52 @@
+package com.tangem.blockchain.common
+
+import java.math.BigDecimal
+import java.util.*
+
+interface Wallet {
+    val config: WalletConfig
+    val address: String
+    val exploreUrl: String?
+    val shareUrl: String?
+}
+
+class WalletConfig(
+        val allowFeeSelection: Boolean,
+        val allowFeeInclusion: Boolean,
+        var allowExtract: Boolean = false,
+        var allowLoad: Boolean = false
+)
+
+data class Amount(
+        val currencySymbol: String,
+        var value: BigDecimal? = null,
+        val address: String? = null,
+        val decimals: Byte,
+        val type: AmountType = AmountType.Coin
+) {
+    constructor(
+            value: BigDecimal?,
+            blockchain: Blockchain,
+            address: String? = null,
+            type: AmountType = AmountType.Coin
+    ) : this(blockchain.currency, value, address, blockchain.decimals, type)
+}
+
+data class TransactionData(
+        val amount: Amount,
+        val fee: Amount?,
+        val sourceAddress: String,
+        val destinationAddress: String,
+        var status: TransactionStatus = TransactionStatus.Unconfirmed,
+        var date: Calendar? = null
+)
+
+enum class AmountType { Coin, Token, Reserve }
+
+enum class TransactionStatus { Confirmed, Unconfirmed }
+
+enum class ValidationError { WrongAmount, WrongFee, WrongTotal }
+
+interface TransactionValidator {
+    fun validateTransaction(amount: Amount, fee: Amount?): EnumSet<ValidationError>
+}
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/common/WalletManager.kt b/blockchain/src/main/java/com/tangem/blockchain/common/WalletManager.kt
new file mode 100644
index 0000000000..967385e85b
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/common/WalletManager.kt
@@ -0,0 +1,26 @@
+package com.tangem.blockchain.common
+
+import com.tangem.blockchain.common.extensions.Result
+import com.tangem.blockchain.common.extensions.SimpleResult
+import com.tangem.commands.SignResponse
+import com.tangem.tasks.TaskEvent
+import kotlinx.coroutines.flow.Flow
+
+interface WalletManager {
+    var wallet: Wallet
+    val blockchain: Blockchain
+
+    suspend fun update()
+}
+
+interface TransactionSender {
+    suspend fun send(transactionData: TransactionData, signer: TransactionSigner) : SimpleResult
+}
+
+interface TransactionSigner {
+    suspend fun sign(hashes: Array<ByteArray>, cardId: String): TaskEvent<SignResponse>
+}
+
+interface FeeProvider {
+    suspend fun getFee(amount: Amount, source: String, destination: String): Result<List<Amount>>
+}
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/common/WalletManagerFactory.kt b/blockchain/src/main/java/com/tangem/blockchain/common/WalletManagerFactory.kt
new file mode 100644
index 0000000000..90d8b57cf9
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/common/WalletManagerFactory.kt
@@ -0,0 +1,82 @@
+package com.tangem.blockchain.common
+
+import com.tangem.blockchain.bitcoin.BitcoinWalletManager
+import com.tangem.blockchain.ethereum.Chain
+import com.tangem.blockchain.ethereum.EthereumWalletManager
+import com.tangem.blockchain.cardano.CardanoWalletManager
+import com.tangem.blockchain.stellar.StellarWalletManager
+import com.tangem.blockchain.xrp.XrpWalletManager
+import com.tangem.commands.Card
+
+object WalletManagerFactory {
+
+    fun makeWalletManager(card: Card): WalletManager? {
+        val walletPublicKey: ByteArray = card.walletPublicKey ?: return null
+        val blockchainName: String = card.cardData?.blockchainName ?: return null
+
+        when {
+            blockchainName == Blockchain.Bitcoin.id -> {
+                return BitcoinWalletManager(
+                        cardId = card.cardId,
+                        walletPublicKey = walletPublicKey,
+                        walletConfig = WalletConfig(true, true)
+                )
+            }
+            blockchainName == Blockchain.BitcoinTestnet.id -> {
+                return BitcoinWalletManager(
+                        cardId = card.cardId,
+                        walletPublicKey = walletPublicKey,
+                        walletConfig = WalletConfig(true, true),
+                        isTestNet = true
+                )
+            }
+            blockchainName == Blockchain.Ethereum.id -> {
+                val chain = Chain.Mainnet
+                return EthereumWalletManager(
+                        cardId = card.cardId,
+                        walletPublicKey = walletPublicKey,
+                        walletConfig = WalletConfig(true, true),
+                        chain = chain
+                )
+            }
+            blockchainName == Blockchain.Stellar.id -> {
+                val token = getToken(card)
+                return StellarWalletManager(
+                        cardId = card.cardId,
+                        walletPublicKey = walletPublicKey,
+                        walletConfig = WalletConfig(true, token == null),
+                        token = token
+                )
+            }
+            blockchainName == Blockchain.Cardano.id -> {
+                return CardanoWalletManager(
+                        cardId = card.cardId,
+                        walletPublicKey = walletPublicKey,
+                        walletConfig = WalletConfig(false, true)
+                )
+            }
+            blockchainName == Blockchain.XRP.id -> {
+                return XrpWalletManager(
+                        cardId = card.cardId,
+                        walletPublicKey = walletPublicKey,
+                        walletConfig = WalletConfig(true, true)
+                )
+            }
+            else -> return null
+        }
+    }
+
+    private fun getToken(card: Card): Token? {
+        val symbol = card.cardData?.tokenSymbol ?: return null
+        val contractAddress = card.cardData?.tokenContractAddress ?: return null
+        val decimals = card.cardData?.tokenDecimal ?: return null
+        return Token(symbol, contractAddress, decimals.toByte())
+    }
+}
+
+
+data class Token(
+        val symbol: String,
+        val contractAddress: String,
+        val decimals: Byte
+)
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/common/extensions/Amount.kt b/blockchain/src/main/java/com/tangem/blockchain/common/extensions/Amount.kt
new file mode 100644
index 0000000000..8a9f4445e1
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/common/extensions/Amount.kt
@@ -0,0 +1,8 @@
+package com.tangem.blockchain.common.extensions
+
+import com.tangem.blockchain.common.Amount
+import java.math.BigInteger
+
+fun Amount.bigIntegerValue(): BigInteger? {
+    return this.value?.movePointRight(this.decimals.toInt())?.toBigInteger()
+}
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/common/extensions/BitInteger.kt b/blockchain/src/main/java/com/tangem/blockchain/common/extensions/BitInteger.kt
new file mode 100644
index 0000000000..6ac80e1bbd
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/common/extensions/BitInteger.kt
@@ -0,0 +1,11 @@
+package com.tangem.blockchain.common.extensions
+
+import org.bitcoinj.core.ECKey
+import java.math.BigInteger
+
+fun BigInteger.toCanonicalised(): BigInteger {
+    if (!this.isCanonical()) ECKey.CURVE.n - this
+    return this
+}
+
+fun BigInteger.isCanonical(): Boolean = this <= ECKey.HALF_CURVE_ORDER
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/common/extensions/ByteArray.kt b/blockchain/src/main/java/com/tangem/blockchain/common/extensions/ByteArray.kt
new file mode 100644
index 0000000000..29ce488afc
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/common/extensions/ByteArray.kt
@@ -0,0 +1,12 @@
+package com.tangem.blockchain.common.extensions
+
+import android.util.Base64
+import org.bitcoinj.core.Base58
+
+fun ByteArray.encodeBase58(): String {
+    return Base58.encode(this)
+}
+
+fun ByteArray.encodeBase64NoWrap(): String {
+    return Base64.encodeToString(this, Base64.NO_WRAP)
+}
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/common/extensions/Coroutines.kt b/blockchain/src/main/java/com/tangem/blockchain/common/extensions/Coroutines.kt
new file mode 100644
index 0000000000..03d2b2f009
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/common/extensions/Coroutines.kt
@@ -0,0 +1,66 @@
+package com.tangem.blockchain.common.extensions
+
+import com.tangem.CardManager
+import com.tangem.blockchain.common.TransactionSigner
+import com.tangem.commands.SignResponse
+import com.tangem.tasks.TaskEvent
+import kotlinx.coroutines.*
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
+import java.io.IOException
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
+
+suspend fun <T> retryIO(
+        times: Int = 3,
+        initialDelay: Long = 100,
+        maxDelay: Long = 1000,
+        factor: Double = 2.0,
+        block: suspend () -> T
+): T {
+    var currentDelay = initialDelay
+    repeat(times - 1) {
+        try {
+            return block()
+        } catch (e: IOException) {
+
+
+        }
+        delay(currentDelay)
+        currentDelay = (currentDelay * factor).toLong().coerceAtMost(maxDelay)
+    }
+    return block() // last attempt
+}
+
+
+//suspend fun <T: Any> handleRequest(requestFunc: suspend () -> T): Result<T> {
+//    return try {
+//        Result.success(requestFunc.invoke())
+//    } catch (he: HttpException) {
+//        Result.failure(he)
+////        HttpException
+////        SocketTimeoutException
+////        IOException
+//    }
+//}
+
+
+sealed class Result<out T : Any> {
+    data class Success<out T : Any>(val data: T) : Result<T>()
+    data class Failure(val error: Throwable?) : Result<Nothing>()
+}
+
+sealed class SimpleResult {
+    object Success : SimpleResult()
+    data class Failure(val error: Throwable?) : SimpleResult()
+}
+
+class Signer(private val cardManager: CardManager) : TransactionSigner {
+    override suspend fun sign(hashes: Array<ByteArray>, cardId: String): TaskEvent<SignResponse> = coroutineScope {
+        async {
+            suspendCancellableCoroutine<TaskEvent<SignResponse>> { continuation ->
+                cardManager.sign(hashes, cardId) { if (continuation.isActive) continuation.resume(it) }
+            }
+        }.await()
+    }
+}
diff --git a/blockchain/src/main/java/com/tangem/blockchain/common/extensions/String.kt b/blockchain/src/main/java/com/tangem/blockchain/common/extensions/String.kt
new file mode 100644
index 0000000000..8f14abf5f8
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/common/extensions/String.kt
@@ -0,0 +1,12 @@
+package com.tangem.blockchain.common.extensions
+
+import org.bitcoinj.core.AddressFormatException
+import org.bitcoinj.core.Base58
+
+fun String.decodeBase58(): ByteArray? {
+    return try {
+        Base58.decode(this)
+    } catch (exception: AddressFormatException) {
+        null
+    }
+}
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/common/network/RetrofitBuilder.kt b/blockchain/src/main/java/com/tangem/blockchain/common/network/RetrofitBuilder.kt
new file mode 100644
index 0000000000..9834fc8cb9
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/common/network/RetrofitBuilder.kt
@@ -0,0 +1,48 @@
+package com.tangem.blockchain.common.network
+
+import com.tangem.blockchain.BuildConfig
+import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
+import retrofit2.Retrofit
+import retrofit2.converter.moshi.MoshiConverterFactory
+
+private val okHttpClient: OkHttpClient by lazy {
+    OkHttpClient.Builder().apply {
+        if (BuildConfig.DEBUG) addInterceptor(createHttpLoggingInterceptor())
+    }.build()
+}
+
+private fun createHttpLoggingInterceptor(): HttpLoggingInterceptor {
+    val logging = HttpLoggingInterceptor()
+    logging.level = HttpLoggingInterceptor.Level.BODY
+    return logging
+}
+
+
+fun createRetrofitInstance(baseUrl: String): Retrofit =
+        Retrofit.Builder()
+                .baseUrl(baseUrl)
+                .addConverterFactory(MoshiConverterFactory.create())
+                .client(okHttpClient)
+                .build()
+
+
+const val API_TANGEM = "https://verify.tangem.com/"
+const val API_COINMARKETCAP = "https://pro-api.coinmarketcap.com/"
+const val API_INFURA = "https://mainnet.infura.io/"
+const val API_SOCHAIN_V2 = "https://chain.so/"
+const val API_ESTIMATEFEE = "https://estimatefee.com/"
+const val API_UPDATE_VERSION = "https://raw.githubusercontent.com/"
+const val API_ROOTSTOCK = "https://public-node.rsk.co/"
+const val API_BLOCKCYPHER = "https://api.blockcypher.com/"
+const val API_BINANCE = "https://dex.binance.org/"
+const val API_BINANCE_TESTNET = "https://testnet-dex.binance.org/"
+const val API_MATIC_TESTNET = "https://testnet2.matic.network/"
+const val API_STELLAR = "https://horizon.stellar.org/"
+const val API_STELLAR_RESERVE = "https://horizon.sui.li/"
+const val API_STELLAR_TESTNET = "https://horizon-testnet.stellar.org/"
+const val API_BLOCKCHAIN_INFO = "https://blockchain.info/"
+const val API_ADALITE = "https://explorer2.adalite.io"
+const val API_ADALITE_RESERVE = "https://nodes.southeastasia.cloudapp.azure.com"
+const val API_RIPPLED = "https://s1.ripple.com:51234"
+const val API_RIPPLED_RESERVE = "https://s2.ripple.com:51234"
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/ethereum/EthereumAddress.kt b/blockchain/src/main/java/com/tangem/blockchain/ethereum/EthereumAddress.kt
new file mode 100644
index 0000000000..200a1ca465
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/ethereum/EthereumAddress.kt
@@ -0,0 +1,33 @@
+package com.tangem.blockchain.ethereum
+
+import org.kethereum.crypto.toAddress
+import org.kethereum.functions.isValid
+import org.kethereum.model.Address
+import org.kethereum.model.PublicKey
+
+class EthereumAddressFactory {
+    companion object {
+        fun makeAddress(walletPublicKey: ByteArray): String =
+                PublicKey(walletPublicKey.sliceArray(1..64)).toAddress().hex
+    }
+}
+
+class EthereumAddressValidator {
+    companion object {
+        fun validate(address: String): Boolean = Address(address).isValid()
+    }
+}
+
+enum class Chain(val id: Int) {
+    Mainnet(1),
+    Morden(2),
+    Ropsten(3),
+    Rinkeby(4),
+    RootstockMainnet(30),
+    RootstockTestnet(31),
+    Kovan(42),
+    EthereumClassicMainnet(61),
+    EthereumClassicTestnet(62),
+    Geth_private_chains(1337),
+    MaticTestnet(8995);
+}
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/ethereum/EthereumWalletManager.kt b/blockchain/src/main/java/com/tangem/blockchain/ethereum/EthereumWalletManager.kt
new file mode 100644
index 0000000000..e7bad943ba
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/ethereum/EthereumWalletManager.kt
@@ -0,0 +1,144 @@
+package com.tangem.blockchain.ethereum
+
+import com.tangem.blockchain.common.*
+import com.tangem.blockchain.common.extensions.Result
+import com.tangem.blockchain.common.extensions.SimpleResult
+import com.tangem.blockchain.ethereum.network.EthereumNetworkManager
+import com.tangem.blockchain.ethereum.network.EthereumResponse
+import com.tangem.blockchain.wallets.CurrencyWallet
+import com.tangem.common.extensions.toHexString
+import com.tangem.tasks.TaskEvent
+import org.kethereum.DEFAULT_GAS_LIMIT
+import org.kethereum.crypto.api.ec.ECDSASignature
+import org.kethereum.crypto.determineRecId
+import org.kethereum.crypto.impl.ec.canonicalise
+import org.kethereum.functions.encodeRLP
+import org.kethereum.keccakshortcut.keccak
+import org.kethereum.model.*
+import java.math.BigDecimal
+import java.math.BigInteger
+
+class EthereumWalletManager(
+        private val cardId: String,
+        private val walletPublicKey: ByteArray,
+        chain: Chain,
+        walletConfig: WalletConfig
+) : WalletManager,
+        TransactionSender,
+        FeeProvider {
+
+    override val blockchain: Blockchain = Blockchain.Ethereum
+    private val address = blockchain.makeAddress(walletPublicKey)
+    private val currencyWallet = CurrencyWallet(walletConfig, address)
+    override var wallet: Wallet = currencyWallet
+    private val builder = EthereumTransactionBuilder(chain)
+    private val networkManager = EthereumNetworkManager()
+    private var pendingTxCount = -1L
+    private var txCount = -1L
+
+    override suspend fun update() {
+        val result = networkManager.getInfo(address, currencyWallet.balances[AmountType.Token]?.address)
+        when (result) {
+            is Result.Failure -> updateError(result.error)
+            is Result.Success -> updateWallet(result.data)
+        }
+    }
+
+    private fun updateWallet(data: EthereumResponse) {
+        currencyWallet.balances[AmountType.Coin]?.value = data.balance
+        currencyWallet.balances[AmountType.Token]?.value = data.tokenBalance
+        txCount = data.txCount
+        pendingTxCount = data.pendingTxCount
+        if (txCount == pendingTxCount) {
+            currencyWallet.pendingTransactions.forEach { it.status = TransactionStatus.Confirmed }
+        } else if (currencyWallet.pendingTransactions.isEmpty()) {
+            currencyWallet.pendingTransactions.add(TransactionData(
+                    Amount(blockchain.currency, decimals = blockchain.decimals),
+                    null,
+                    "unknown",
+                    currencyWallet.address))
+        }
+    }
+
+    private fun updateError(error: Throwable?) {
+
+    }
+
+    override suspend fun send(transactionData: TransactionData, signer: TransactionSigner): SimpleResult {
+        val transactionToSign = builder.buildToSign(transactionData, txCount.toBigInteger())
+                ?: return SimpleResult.Failure(Exception("Not enough data"))
+        when (val signerResponse = signer.sign(transactionToSign.hashes.toTypedArray(), cardId)) {
+            is TaskEvent.Event -> {
+                val transactionToSend = builder.buildToSend(signerResponse.data.signature, transactionToSign, walletPublicKey)
+                return networkManager.sendTransaction(String.format("0x%s", transactionToSend.toHexString()))
+            }
+            is TaskEvent.Completion -> return SimpleResult.Failure(signerResponse.error)
+        }
+    }
+
+    override suspend fun getFee(amount: Amount, source: String, destination: String): Result<List<Amount>> {
+        val result = networkManager.getFee(getGasLimit(amount).value)
+        when (result) {
+            is Result.Success -> {
+                val feeValues: List<BigDecimal> = result.data
+                return Result.Success(
+                        feeValues.map { Amount(blockchain.currency, it, address, blockchain.decimals) })
+            }
+            is Result.Failure -> return result
+        }
+    }
+}
+
+private class EthereumTransactionBuilder(private val chain: Chain) {
+
+    fun buildToSign(transactionData: TransactionData, nonce: BigInteger?): TransactionToSign? {
+
+        val amount: BigDecimal = transactionData.amount.value ?: return null
+        val transactionFee: BigDecimal = transactionData.fee?.value ?: return null
+
+        val value = amount.movePointRight(transactionData.amount.decimals.toInt()).toBigInteger()
+        val fee = transactionFee.movePointRight(transactionData.fee.decimals.toInt()).toBigInteger()
+
+        val transaction = createTransactionWithDefaults(
+                from = Address(transactionData.sourceAddress),
+                to = Address(transactionData.destinationAddress),
+                value = value,
+                gasPrice = fee.divide(DEFAULT_GAS_LIMIT),
+                gasLimit = DEFAULT_GAS_LIMIT,
+                nonce = nonce,
+                chain = ChainId(chain.id.toLong())
+        )
+        val hash = transaction.encodeRLP(SignatureData(v = chain.id.toBigInteger())).keccak()
+        return TransactionToSign(transaction, listOf(hash))
+    }
+
+    fun buildToSend(signature: ByteArray, transactionToSign: TransactionToSign, walletPublicKey: ByteArray): ByteArray {
+        val r = BigInteger(1, signature.copyOfRange(0, 32))
+        val s = BigInteger(1, signature.copyOfRange(32, 64))
+
+        val ecdsaSignature = ECDSASignature(r, s).canonicalise()
+
+        val recId = ecdsaSignature.determineRecId(transactionToSign.hashes[0], PublicKey(walletPublicKey.sliceArray(1..64)))
+        val v = (recId + 27 + 8 + (chain.id * 2)).toBigInteger()
+        val signatureData = SignatureData(ecdsaSignature.r, ecdsaSignature.s, v)
+
+        return transactionToSign.transaction.encodeRLP(signatureData)
+    }
+}
+
+private class TransactionToSign(val transaction: Transaction, val hashes: List<ByteArray>)
+
+enum class GasLimit(val value: Long) {
+    Default(21000),
+    Token(60000),
+    High(300000)
+}
+
+private fun getGasLimit(amount: Amount): GasLimit {
+    return when (amount.currencySymbol) {
+        Blockchain.Ethereum.currency -> GasLimit.Default
+        "DGX" -> GasLimit.High
+        "CGT" -> GasLimit.High
+        else -> GasLimit.Token
+    }
+}
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/ethereum/network/EthereumNetworkManager.kt b/blockchain/src/main/java/com/tangem/blockchain/ethereum/network/EthereumNetworkManager.kt
new file mode 100644
index 0000000000..c141f51aef
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/ethereum/network/EthereumNetworkManager.kt
@@ -0,0 +1,100 @@
+package com.tangem.blockchain.ethereum.network
+
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.blockchain.common.extensions.Result
+import com.tangem.blockchain.common.extensions.SimpleResult
+import com.tangem.blockchain.common.extensions.retryIO
+import com.tangem.blockchain.common.network.API_INFURA
+import com.tangem.blockchain.common.network.createRetrofitInstance
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.async
+import kotlinx.coroutines.coroutineScope
+import org.kethereum.ETH_IN_WEI
+import java.math.BigDecimal
+import java.math.BigInteger
+import java.math.RoundingMode
+
+
+class EthereumNetworkManager {
+
+    private val api: InfuraApi by lazy {
+        createRetrofitInstance(API_INFURA).create(InfuraApi::class.java)
+    }
+
+    private val provider: InfuraProvider by lazy { InfuraProvider(api) }
+
+    suspend fun sendTransaction(transaction: String): SimpleResult {
+        return try {
+            val response = retryIO { provider.sendTransaction(transaction) }
+            if (response.error == null) {
+                SimpleResult.Success
+            } else {
+                SimpleResult.Failure(Exception("Code: ${(response.error.code)}, ${(response.error.message)}"))
+            }
+        } catch (error: Exception) {
+            SimpleResult.Failure(error)
+        }
+    }
+
+    suspend fun getFee(gasLimit: Long): Result<List<BigDecimal>> {
+        return try {
+            Result.Success(
+                    provider.getGasPrice().result!!.parseFee(gasLimit)
+            )
+        } catch (error: Exception) {
+            Result.Failure(error)
+        }
+    }
+
+    suspend fun getInfo(address: String, contractAddress: String? = null): Result<EthereumResponse> {
+        return try {
+            coroutineScope {
+                val balanceResponse = retryIO { async { provider.getBalance(address) } }
+                val txCountResponse = retryIO { async { provider.getTxCount(address) } }
+                val pendingTxCountResponse = retryIO { async { provider.getPendingTxCount(address) } }
+                var tokenBalanceResponse: Deferred<InfuraResponse>? = null
+                if (contractAddress != null) {
+                    tokenBalanceResponse = retryIO { async { provider.getTokenBalance(address, contractAddress) } }
+                }
+                Result.Success(EthereumResponse(
+                        balanceResponse.await().result!!.parseAmount(),
+                        tokenBalanceResponse?.await()?.result?.parseAmount(),
+                        txCountResponse.await().result?.responseToNumber()?.toLong() ?: 0,
+                        pendingTxCountResponse.await().result?.responseToNumber()?.toLong() ?: 0
+                ))
+            }
+        } catch (error: Exception) {
+            Result.Failure(error)
+        }
+    }
+
+    private fun String.parseFee(gasLimit: Long): List<BigDecimal> {
+        val gasPrice = this.responseToNumber().toBigDecimal()
+        val minFee = gasPrice.multiply(gasLimit.toBigDecimal())
+        val normalFee = minFee.multiply(BigDecimal(1.2))
+        val priorityFee = minFee.multiply(BigDecimal(1.5))
+        return listOf(
+                minFee.convertFeeToEth(),
+                normalFee.convertFeeToEth(),
+                priorityFee.convertFeeToEth()
+        )
+    }
+
+    private fun String.responseToNumber(): BigInteger = this.substring(2).toBigInteger(16)
+
+    private fun String.parseAmount(): BigDecimal =
+            this.responseToNumber().toBigDecimal().divide(ETH_IN_WEI.toBigDecimal())
+
+    private fun BigDecimal.convertFeeToEth(): BigDecimal {
+        return this.divide(ETH_IN_WEI.toBigDecimal())
+                .setScale(12, Blockchain.Ethereum.roundingMode()).stripTrailingZeros()
+    }
+
+}
+
+data class EthereumResponse(
+        val balance: BigDecimal,
+        val tokenBalance: BigDecimal?,
+        val txCount: Long,
+        val pendingTxCount: Long
+)
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/ethereum/network/InfuraApi.kt b/blockchain/src/main/java/com/tangem/blockchain/ethereum/network/InfuraApi.kt
new file mode 100644
index 0000000000..df84fae5ad
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/ethereum/network/InfuraApi.kt
@@ -0,0 +1,31 @@
+package com.tangem.blockchain.ethereum.network
+
+import com.squareup.moshi.JsonClass
+import retrofit2.http.Body
+import retrofit2.http.Headers
+import retrofit2.http.POST
+
+interface InfuraApi {
+    @Headers("Content-Type: application/json")
+    @POST("v3/613a0b14833145968b1f656240c7d245")
+    suspend fun postToInfura(@Body body: InfuraBody?): InfuraResponse
+}
+
+@JsonClass(generateAdapter = true)
+data class InfuraBody(
+        val jsonrpc: String = "2.0",
+        val id: Int = 67,
+        val method: String? = null,
+        val params: List<Any> = listOf()
+)
+
+data class EthCallParams(private val data: String, private val to: String)
+
+enum class InfuraMethod(val value: String) {
+    GET_BALANCE("eth_getBalance"),
+    GET_TRANSACTION_COUNT("eth_getTransactionCount"),
+    GET_PENDING_COUNT("eth_getPendingCount"),
+    CALL("eth_call"),
+    SEND_RAW_TRANSACTION("eth_sendRawTransaction"),
+    GAS_PRICE("eth_gasPrice")
+}
diff --git a/blockchain/src/main/java/com/tangem/blockchain/ethereum/network/InfuraProvider.kt b/blockchain/src/main/java/com/tangem/blockchain/ethereum/network/InfuraProvider.kt
new file mode 100644
index 0000000000..2a04de5825
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/ethereum/network/InfuraProvider.kt
@@ -0,0 +1,39 @@
+package com.tangem.blockchain.ethereum.network
+
+class InfuraProvider(private val api: InfuraApi) {
+    suspend fun getBalance(address: String) = api.postToInfura(createInfuraBody(InfuraMethod.GET_BALANCE, address))
+    suspend fun getTokenBalance(address: String, contractAddress: String) = api.postToInfura(createInfuraBody(InfuraMethod.CALL, address, contractAddress))
+    suspend fun getTxCount(address: String) = api.postToInfura(createInfuraBody(InfuraMethod.GET_TRANSACTION_COUNT, address))
+    suspend fun getPendingTxCount(address: String) = api.postToInfura(createInfuraBody(InfuraMethod.GET_PENDING_COUNT, address))
+    suspend fun getGasPrice() = api.postToInfura(createInfuraBody(InfuraMethod.GAS_PRICE))
+    suspend fun sendTransaction(transaction: String) = api.postToInfura(createInfuraBody(InfuraMethod.SEND_RAW_TRANSACTION, transaction = transaction))
+}
+
+private fun createInfuraBody(
+        method: InfuraMethod,
+        address: String? = null,
+        contractAddress: String? = null,
+        transaction: String? = null): InfuraBody {
+
+    return when (method) {
+        InfuraMethod.GET_BALANCE ->
+            InfuraBody(method = InfuraMethod.GET_BALANCE.value, params = listOf(address ?: "", "latest"))
+        InfuraMethod.GET_TRANSACTION_COUNT ->
+            InfuraBody(method = InfuraMethod.GET_TRANSACTION_COUNT.value, params = listOf(address ?: "", "latest"))
+        InfuraMethod.GET_PENDING_COUNT ->
+            InfuraBody(method = InfuraMethod.GET_TRANSACTION_COUNT.value, params = listOf(address ?: "", "pending"))
+        InfuraMethod.GAS_PRICE ->
+            InfuraBody(method = InfuraMethod.GAS_PRICE.value)
+        InfuraMethod.SEND_RAW_TRANSACTION ->
+            InfuraBody(method = InfuraMethod.SEND_RAW_TRANSACTION.value, params = listOf(transaction ?: ""))
+        InfuraMethod.CALL -> {
+            InfuraBody(
+                    method = InfuraMethod.CALL.value,
+                    params = listOf(EthCallParams(
+                            "0x70a08231000000000000000000000000" + address?.substring(2), contractAddress
+                            ?: ""),
+                            "latest"
+                    ))
+        }
+    }
+}
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/ethereum/network/InfuraResponse.kt b/blockchain/src/main/java/com/tangem/blockchain/ethereum/network/InfuraResponse.kt
new file mode 100644
index 0000000000..6e193290b5
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/ethereum/network/InfuraResponse.kt
@@ -0,0 +1,30 @@
+package com.tangem.blockchain.ethereum.network
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class InfuraResponse(
+        @Json(name = "jsonrpc")
+        val jsonrpc: String = "",
+
+        @Json(name = "id")
+        val id: Int? = null,
+
+        @Json(name = "result")
+        val result: String? = null,
+
+        @Json(name = "error")
+        val error: InfuraError? = null
+)
+
+@JsonClass(generateAdapter = true)
+data class InfuraError(
+        @Json(name = "code")
+        val code: Int? = null,
+
+        @Json(name = "message")
+        val message: String? = null
+)
+
+
diff --git a/blockchain/src/main/java/com/tangem/blockchain/stellar/StellarAddress.kt b/blockchain/src/main/java/com/tangem/blockchain/stellar/StellarAddress.kt
new file mode 100644
index 0000000000..605d8f3e2e
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/stellar/StellarAddress.kt
@@ -0,0 +1,24 @@
+package com.tangem.blockchain.stellar
+
+import org.stellar.sdk.KeyPair
+
+class StellarAddressFactory {
+    companion object {
+        fun makeAddress(cardPublicKey: ByteArray): String {
+            val kp = KeyPair.fromPublicKey(cardPublicKey)
+            return kp.accountId
+        }
+    }
+}
+
+class StellarAddressValidator {
+    companion object {
+        fun validate(address: String): Boolean {
+            return try {
+                KeyPair.fromAccountId(address) != null
+            } catch (exception: IllegalArgumentException) {
+                false
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/stellar/StellarNetworkManager.kt b/blockchain/src/main/java/com/tangem/blockchain/stellar/StellarNetworkManager.kt
new file mode 100644
index 0000000000..87102f42e6
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/stellar/StellarNetworkManager.kt
@@ -0,0 +1,100 @@
+package com.tangem.blockchain.stellar
+
+import com.tangem.blockchain.common.extensions.Result
+import com.tangem.blockchain.common.extensions.SimpleResult
+import com.tangem.blockchain.common.network.API_STELLAR
+import com.tangem.blockchain.common.network.API_STELLAR_TESTNET
+import com.tangem.blockchain.stellar.StellarWalletManager.Companion.STROOPS_IN_XLM
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.coroutineScope
+import org.stellar.sdk.Network
+import org.stellar.sdk.Server
+import org.stellar.sdk.Transaction
+import org.stellar.sdk.requests.ErrorResponse
+import java.io.IOException
+import java.math.BigDecimal
+
+class StellarNetworkManager(isTestNet: Boolean) {
+
+    val network: Network = if (isTestNet) Network.TESTNET else Network.PUBLIC
+    private val stellarServer by lazy {
+        Server(if (isTestNet) API_STELLAR_TESTNET else API_STELLAR)
+    }
+
+    suspend fun sendTransaction(transaction: String): SimpleResult {
+        return try {
+            val response = stellarServer.submitTransaction(Transaction.fromEnvelopeXdr(transaction, network))
+            if (response.isSuccess) {
+                SimpleResult.Success
+            } else {
+                val trResult: String? = response.extras?.resultCodes?.transactionResultCode +
+                        (response.extras?.resultCodes?.operationsResultCodes?.getOrNull(0) ?: "")
+                SimpleResult.Failure(Exception(trResult ?: "transaction failed"))
+            }
+        } catch (error: Exception) {
+            SimpleResult.Failure(error)
+        }
+    }
+
+    suspend fun checkIsAccountCreated(address: String): Boolean {
+        try {
+            stellarServer.accounts().account(address)
+            return true
+        } catch (errorResponse: ErrorResponse) {
+            if (errorResponse.code == 404) return false
+            return false
+        } catch (exception: IOException) {
+            return false
+        }
+    }
+
+    suspend fun getInfo(accountId: String, assetCode: String? = null): Result<StellarResponse> {
+        return try {
+            coroutineScope {
+                val accountResponseDefered = async(Dispatchers.IO) { stellarServer.accounts().account(accountId) }
+                val ledgerResponseDeferred = async(Dispatchers.IO) {
+                    val latestLedger: Int = stellarServer.root().coreLatestLedger
+                    stellarServer.ledgers().ledger(latestLedger.toLong())
+                }
+
+                val accountResponse = accountResponseDefered.await()
+                val balance = accountResponse.balances
+                        .find { it.assetType == "native" }
+                        ?.balance?.toBigDecimal()
+                        ?: return@coroutineScope Result.Failure(Exception("Stellar Balance not found"))
+                val assetBalance = if (assetCode == null) {
+                    null
+                } else {
+                    accountResponse.balances
+                            .find { it.assetType != "native" && it.assetCode == assetCode }
+                            ?.balance?.toBigDecimal()
+                            ?: return@coroutineScope Result.Failure(Exception("Stellar Balance not found"))
+                }
+                val sequence = accountResponse.sequenceNumber
+
+                val ledgerResponse = ledgerResponseDeferred.await()
+                val baseFee = ledgerResponse.baseFeeInStroops.toBigDecimal().divide(STROOPS_IN_XLM)
+                val baseReserve = ledgerResponse.baseReserveInStroops.toBigDecimal().divide(STROOPS_IN_XLM)
+
+                Result.Success(StellarResponse(
+                        baseFee,
+                        baseReserve,
+                        assetBalance,
+                        balance,
+                        sequence
+                ))
+            }
+        } catch (error: Exception) {
+            Result.Failure(error)
+        }
+    }
+}
+
+data class StellarResponse(
+        val baseFee: BigDecimal,
+        val baseReserve: BigDecimal,
+        val assetBalance: BigDecimal?,
+        val balance: BigDecimal,
+        val sequence: Long
+)
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/stellar/StellarTransactionBuilder.kt b/blockchain/src/main/java/com/tangem/blockchain/stellar/StellarTransactionBuilder.kt
new file mode 100644
index 0000000000..ebe47c630e
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/stellar/StellarTransactionBuilder.kt
@@ -0,0 +1,84 @@
+package com.tangem.blockchain.stellar
+
+import com.tangem.blockchain.common.AmountType
+import com.tangem.blockchain.common.TransactionData
+import com.tangem.blockchain.stellar.StellarWalletManager.Companion.BASE_FEE
+import com.tangem.blockchain.stellar.StellarWalletManager.Companion.STROOPS_IN_XLM
+import com.tangem.common.extensions.hexToBytes
+import org.stellar.sdk.*
+import org.stellar.sdk.xdr.AccountID
+import org.stellar.sdk.xdr.DecoratedSignature
+import org.stellar.sdk.xdr.Signature
+import org.stellar.sdk.xdr.SignatureHint
+import java.util.*
+
+class StellarTransactionBuilder(private val newtorkManager: StellarNetworkManager, private val publicKey: ByteArray) {
+
+    private lateinit var transaction: Transaction
+
+    suspend fun buildToSign(transactionData: TransactionData, sequence: Long, fee: Int): List<ByteArray> {
+
+        val destinationKeyPair = KeyPair.fromAccountId(transactionData.destinationAddress)
+        val sourceKeyPair = KeyPair.fromAccountId(transactionData.sourceAddress)
+
+        if (transactionData.amount.type == AmountType.Coin) {
+            val operation = if (newtorkManager.checkIsAccountCreated(transactionData.sourceAddress)) {
+                PaymentOperation.Builder(destinationKeyPair.accountId,
+                        AssetTypeNative(),
+                        transactionData.amount.value.toString())
+                        .build()
+            } else {
+                CreateAccountOperation.Builder(destinationKeyPair.accountId, transactionData.amount.value.toString()).build()
+            }
+            return serializeOperation(operation, sourceKeyPair, sequence, fee)
+
+        } else if (transactionData.amount.type == AmountType.Token) {
+            val keyPair = KeyPair.fromAccountId(transactionData.amount.address)
+            val asset = Asset.createNonNativeAsset(transactionData.amount.currencySymbol, keyPair.accountId)
+            val operation: Operation = if (transactionData.amount.value != null) {
+                PaymentOperation.Builder(
+                        destinationKeyPair.accountId,
+                        asset,
+                        transactionData.amount.value!!.toPlainString())
+                        .build()
+            } else {
+                ChangeTrustOperation.Builder(asset, "900000000000.0000000")
+                        .setSourceAccount(sourceKeyPair.accountId)
+                        .build()
+            }
+            return serializeOperation(operation, sourceKeyPair, sequence, fee)
+        } else {
+            return emptyList()
+        }
+    }
+
+    private fun serializeOperation(
+            operation: Operation, sourceKeyPair: KeyPair,
+            sequence: Long, fee: Int
+    ): List<ByteArray> {
+
+        val accountID = AccountID()
+        accountID.accountID = sourceKeyPair.xdrPublicKey
+        val currentTime = Calendar.getInstance().timeInMillis / 1000
+        val minTime = 0L
+        val maxTime = currentTime + 120
+
+        transaction = Transaction.Builder(
+                Account(sourceKeyPair.accountId, sequence), newtorkManager.network)
+                .addOperation(operation)
+                .addTimeBounds(TimeBounds(minTime, maxTime))
+                .setOperationFee(fee)
+                .build()
+        return listOf<ByteArray>(transaction.hash())
+    }
+
+    fun buildToSend(signature: ByteArray): String {
+        val hint = publicKey.takeLast(4).toByteArray()
+        val decoratedSignature = DecoratedSignature().apply {
+            this.hint = SignatureHint().apply { signatureHint = hint }
+            this.signature = Signature().apply { this.signature = signature }
+        }
+        transaction.signatures.add(decoratedSignature)
+        return transaction.toEnvelopeXdrBase64()
+    }
+}
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/stellar/StellarWalletManager.kt b/blockchain/src/main/java/com/tangem/blockchain/stellar/StellarWalletManager.kt
new file mode 100644
index 0000000000..a8b02ccf97
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/stellar/StellarWalletManager.kt
@@ -0,0 +1,95 @@
+package com.tangem.blockchain.stellar
+
+import com.tangem.blockchain.common.*
+import com.tangem.blockchain.common.extensions.Result
+import com.tangem.blockchain.common.extensions.SimpleResult
+import com.tangem.blockchain.wallets.CurrencyWallet
+import com.tangem.tasks.TaskEvent
+import java.math.BigDecimal
+import java.util.*
+
+class StellarWalletManager(
+        private val cardId: String,
+        walletPublicKey: ByteArray,
+        walletConfig: WalletConfig,
+        token: Token? = null,
+        isTestNet: Boolean = false
+) : WalletManager,
+        TransactionSender,
+        FeeProvider {
+
+    override val blockchain: Blockchain = Blockchain.Stellar
+    private val address = blockchain.makeAddress(walletPublicKey)
+    private val currencyWallet = CurrencyWallet(walletConfig, address)
+    override var wallet: Wallet = currencyWallet
+    private val networkManager = StellarNetworkManager(isTestNet)
+    private val builder = StellarTransactionBuilder(networkManager, walletPublicKey)
+    private var baseFee = BASE_FEE
+    private var baseReserve = BASE_RESERVE
+    private var sequence = 0L
+
+    init {
+        if (token != null) currencyWallet.balances[AmountType.Token] =
+                Amount(
+                        token.symbol,
+                        null,
+                        token.contractAddress,
+                        token.decimals,
+                        AmountType.Token)
+    }
+
+    override suspend fun update() {
+        val result = networkManager.getInfo(address, currencyWallet.balances[AmountType.Token]?.address)
+        when (result) {
+            is Result.Failure -> updateError(result.error)
+            is Result.Success -> updateWallet(result.data)
+        }
+    }
+
+    private fun updateWallet(data: StellarResponse) {
+        currencyWallet.balances[AmountType.Coin]?.value = data.balance
+        currencyWallet.balances[AmountType.Token]?.value = data.assetBalance
+        currencyWallet.balances[AmountType.Reserve]?.value = data.baseReserve
+        sequence = data.sequence
+        baseFee = data.baseFee
+        baseReserve = data.baseReserve
+
+        val currentTime = Calendar.getInstance().timeInMillis
+        currencyWallet.pendingTransactions.forEach { transaction ->
+            if (transaction.date?.timeInMillis ?: 0 - currentTime > 10) {
+                transaction.status = TransactionStatus.Confirmed
+            }
+        }
+    }
+
+    private fun updateError(error: Throwable?) {
+
+    }
+
+    override suspend fun send(transactionData: TransactionData, signer: TransactionSigner): SimpleResult {
+        val hashes = builder.buildToSign(transactionData, sequence, baseFee.toStroops())
+        when (val signerResponse = signer.sign(hashes.toTypedArray(), cardId)) {
+            is TaskEvent.Event -> {
+                val transactionToSend = builder.buildToSend(signerResponse.data.signature)
+                return networkManager.sendTransaction(transactionToSend)
+            }
+            is TaskEvent.Completion -> return SimpleResult.Failure(signerResponse.error)
+        }
+    }
+
+    override suspend fun getFee(amount: Amount, source: String, destination: String): Result<List<Amount>> {
+        return Result.Success(listOf(
+                Amount(baseFee, blockchain)
+        ))
+    }
+
+    private fun BigDecimal.toStroops(): Int {
+        return this.multiply(STROOPS_IN_XLM).toInt()
+    }
+
+    companion object {
+        val STROOPS_IN_XLM = 10000000.toBigDecimal()
+        val BASE_FEE = 0.00001.toBigDecimal()
+        val BASE_RESERVE = 0.5.toBigDecimal()
+    }
+}
diff --git a/blockchain/src/main/java/com/tangem/blockchain/wallets/CurrencyWallet.kt b/blockchain/src/main/java/com/tangem/blockchain/wallets/CurrencyWallet.kt
new file mode 100644
index 0000000000..218964d51c
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/wallets/CurrencyWallet.kt
@@ -0,0 +1,20 @@
+package com.tangem.blockchain.wallets
+
+import com.tangem.blockchain.common.*
+import java.util.*
+
+class CurrencyWallet(
+        override val config: WalletConfig,
+        override val address: String,
+        override val exploreUrl: String? = null,
+        override val shareUrl: String? = null,
+        val pendingTransactions: MutableList<TransactionData> = mutableListOf(),
+        val balances: MutableMap<AmountType, Amount> = mutableMapOf(),
+        val isTestnet: Boolean = false
+) : Wallet, TransactionValidator {
+
+
+    override fun validateTransaction(amount: Amount, fee: Amount?): EnumSet<ValidationError> {
+        TODO("not implemented")
+    }
+}
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/xrp/XrpAddress.kt b/blockchain/src/main/java/com/tangem/blockchain/xrp/XrpAddress.kt
new file mode 100644
index 0000000000..2bd702f67f
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/xrp/XrpAddress.kt
@@ -0,0 +1,38 @@
+package com.tangem.blockchain.xrp
+
+import com.ripple.encodings.addresses.Addresses
+import com.tangem.common.extensions.calculateRipemd160
+import com.tangem.common.extensions.calculateSha256
+import com.tangem.common.extensions.toCompressedPublicKey
+
+class XrpAddressFactory {
+    companion object {
+        fun makeAddress(walletPublicKey: ByteArray): String {
+            val canonicalPublicKey = canonizePublicKey(walletPublicKey)
+            val publicKeyHash = canonicalPublicKey.calculateSha256().calculateRipemd160()
+            return Addresses.encodeAccountID(publicKeyHash)
+        }
+
+        fun canonizePublicKey(publicKey: ByteArray): ByteArray {
+            val compressedPublicKey = publicKey.toCompressedPublicKey()
+            return if (compressedPublicKey.size == 32) {
+                byteArrayOf(0xED.toByte()) + compressedPublicKey
+            } else {
+                compressedPublicKey
+            }
+        }
+    }
+}
+
+class XrpAddressValidator {
+    companion object {
+        fun validate(address: String): Boolean {
+            return try {
+                Addresses.decodeAccountID(address)
+                address.startsWith("r")
+            } catch (excpetion: Exception) {
+                false
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/xrp/XrpTransactionBuilder.kt b/blockchain/src/main/java/com/tangem/blockchain/xrp/XrpTransactionBuilder.kt
new file mode 100644
index 0000000000..a91258d524
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/xrp/XrpTransactionBuilder.kt
@@ -0,0 +1,54 @@
+package com.tangem.blockchain.xrp
+
+import com.ripple.core.coretypes.AccountID
+import com.ripple.core.coretypes.Amount
+import com.ripple.core.coretypes.uint.UInt32
+import com.ripple.crypto.ecdsa.ECDSASignature
+import com.ripple.utils.HashUtils
+import com.tangem.blockchain.common.TransactionData
+import com.tangem.blockchain.common.extensions.bigIntegerValue
+import com.tangem.blockchain.xrp.override.XrpPayment
+import com.tangem.blockchain.xrp.override.XrpSignedTransaction
+import org.bitcoinj.core.ECKey
+import java.math.BigInteger
+
+class XrpTransactionBuilder(walletPublicKey: ByteArray) {
+    private val canonicalPublicKey = XrpAddressFactory.canonizePublicKey(walletPublicKey)
+    var sequence: Long? = null
+    private var transaction: XrpSignedTransaction? = null
+
+    fun buildToSign(transactionData: TransactionData): ByteArray {
+        val payment = XrpPayment()
+        payment.putTranslated(AccountID.Account, transactionData.sourceAddress)
+        payment.putTranslated(AccountID.Destination, transactionData.destinationAddress)
+        payment.putTranslated(Amount.Amount, transactionData.amount.bigIntegerValue().toString())
+        payment.putTranslated(UInt32.Sequence, sequence)
+        payment.putTranslated(Amount.Fee, transactionData.fee!!.bigIntegerValue().toString())
+
+        transaction = payment.prepare(canonicalPublicKey)
+
+        return if (canonicalPublicKey[0] == 0xED.toByte()) {
+            transaction!!.signingData
+        } else {
+            HashUtils.halfSha512(transaction!!.signingData)
+        }
+    }
+
+    fun buildToSend(signature: ByteArray): String {
+        if (canonicalPublicKey[0] == 0xED.toByte()) {
+            transaction!!.addSign(signature)
+        } else {
+            val derSignature = encodeDerSignature(signature)
+            transaction!!.addSign(derSignature)
+        }
+        return transaction!!.tx_blob
+    }
+
+    private fun encodeDerSignature(signature: ByteArray): ByteArray {
+        val r = BigInteger(1, signature.copyOfRange(0, 32))
+        val s = BigInteger(1, signature.copyOfRange(32, 64))
+        val canonicalS = ECKey.ECDSASignature(r, s).toCanonicalised().s
+        val ecdsaSignature = ECDSASignature(r, canonicalS)
+        return ecdsaSignature.encodeToDER()
+    }
+}
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/xrp/XrpWalletManager.kt b/blockchain/src/main/java/com/tangem/blockchain/xrp/XrpWalletManager.kt
new file mode 100644
index 0000000000..f2ea7fa7d3
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/xrp/XrpWalletManager.kt
@@ -0,0 +1,86 @@
+package com.tangem.blockchain.xrp
+
+import android.util.Log
+import com.tangem.blockchain.common.*
+import com.tangem.blockchain.common.extensions.Result
+import com.tangem.blockchain.common.extensions.SimpleResult
+import com.tangem.blockchain.wallets.CurrencyWallet
+import com.tangem.blockchain.xrp.network.XrpInfoResponse
+import com.tangem.blockchain.xrp.network.XrpNetworkManager
+import com.tangem.tasks.TaskEvent
+
+class XrpWalletManager(
+        private val cardId: String,
+        private val walletPublicKey: ByteArray,
+        walletConfig: WalletConfig
+) : WalletManager,
+        TransactionSender,
+        FeeProvider {
+
+    override val blockchain = Blockchain.XRP
+    private val address = blockchain.makeAddress(walletPublicKey)
+    private val currencyWallet = CurrencyWallet(walletConfig, address)
+    override var wallet: Wallet = currencyWallet
+    private val transactionBuilder = XrpTransactionBuilder(walletPublicKey)
+    private val networkManager = XrpNetworkManager()
+
+    override suspend fun update() {
+        val result = networkManager.getInfo(address)
+        when (result) {
+            is Result.Success -> updateWallet(result.data)
+            is Result.Failure -> updateError(result.error)
+        }
+    }
+
+    private fun updateWallet(response: XrpInfoResponse) {
+        Log.d(this::class.java.simpleName, "Balance is ${response.balance}")
+        currencyWallet.balances[AmountType.Reserve]?.value = response.reserveBase
+
+        if (!response.accountFound) {
+            updateError(Exception("Account not found")) //TODO rework, add reserve
+            return
+        }
+        currencyWallet.balances[AmountType.Coin]?.value = response.balance - response.reserveBase
+        transactionBuilder.sequence = response.sequence
+
+        if (response.hasUnconfirmed) {
+            if (currencyWallet.pendingTransactions.isEmpty()) {
+                currencyWallet.pendingTransactions.add(TransactionData(
+                        Amount(blockchain.currency, decimals = blockchain.decimals),
+                        null,
+                        "unknown",
+                        currencyWallet.address))
+            }
+        } else {
+            currencyWallet.pendingTransactions.clear()
+        }
+    }
+
+    private fun updateError(error: Throwable?) {
+        Log.e(this::class.java.simpleName, error?.message ?: "")
+    }
+
+    override suspend fun send(transactionData: TransactionData, signer: TransactionSigner): SimpleResult {
+        val transactionHash = transactionBuilder.buildToSign(transactionData)
+
+        when (val signerResponse = signer.sign(arrayOf(transactionHash), cardId)) {
+            is TaskEvent.Event -> {
+                val transactionToSend = transactionBuilder.buildToSend(signerResponse.data.signature)
+                return networkManager.sendTransaction(transactionToSend)
+            }
+            is TaskEvent.Completion -> return SimpleResult.Failure(signerResponse.error)
+        }
+    }
+
+    override suspend fun getFee(amount: Amount, source: String, destination: String): Result<List<Amount>> {
+        val result = networkManager.getFee()
+        when (result) {
+            is Result.Failure -> return result
+            is Result.Success -> return Result.Success(listOf(
+                    Amount(result.data.minimalFee, blockchain),
+                    Amount(result.data.normalFee, blockchain),
+                    Amount(result.data.priorityFee, blockchain)
+            ))
+        }
+    }
+}
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/xrp/network/XrpNetworkManager.kt b/blockchain/src/main/java/com/tangem/blockchain/xrp/network/XrpNetworkManager.kt
new file mode 100644
index 0000000000..c7aa738a23
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/xrp/network/XrpNetworkManager.kt
@@ -0,0 +1,92 @@
+package com.tangem.blockchain.xrp.network
+
+import com.tangem.blockchain.bitcoin.network.BitcoinFee
+import com.tangem.blockchain.common.extensions.Result
+import com.tangem.blockchain.common.extensions.SimpleResult
+import com.tangem.blockchain.common.network.API_RIPPLED
+import com.tangem.blockchain.common.network.API_RIPPLED_RESERVE
+import com.tangem.blockchain.common.network.createRetrofitInstance
+import com.tangem.blockchain.xrp.network.rippled.RippledApi
+import com.tangem.blockchain.xrp.network.rippled.RippledProvider
+import retrofit2.HttpException
+import java.io.IOException
+import java.math.BigDecimal
+
+class XrpNetworkManager {
+    private val rippledProvider by lazy {
+        val api = createRetrofitInstance(API_RIPPLED)
+                .create(RippledApi::class.java)
+        RippledProvider(api)
+    }
+
+    private val rippledReserveProvider by lazy {
+        val api = createRetrofitInstance(API_RIPPLED_RESERVE)
+                .create(RippledApi::class.java)
+        RippledProvider(api)
+    }
+
+    var provider = rippledProvider
+
+    private fun changeProvider() {
+        provider = if (provider == rippledProvider) rippledReserveProvider else rippledProvider
+    }
+
+    suspend fun getInfo(address: String): Result<XrpInfoResponse> {
+        val result = provider.getInfo(address)
+        when (result) {
+            is Result.Success -> return result
+            is Result.Failure -> {
+                if (result.error is IOException || result.error is HttpException) {
+                    changeProvider()
+                    return provider.getInfo(address)
+                } else {
+                    return result
+                }
+            }
+        }
+    }
+
+    suspend fun sendTransaction(transaction: String): SimpleResult {
+        val result = provider.sendTransaction(transaction)
+        when (result) {
+            is SimpleResult.Success -> return result
+            is SimpleResult.Failure -> {
+                if (result.error is IOException || result.error is HttpException) {
+                    changeProvider()
+                    return provider.sendTransaction(transaction)
+                } else {
+                    return result
+                }
+            }
+        }
+    }
+
+    suspend fun getFee(): Result<XrpFeeResponse> {
+        val result = provider.getFee()
+        when (result) {
+            is Result.Success -> return result
+            is Result.Failure -> {
+                if (result.error is IOException || result.error is HttpException) {
+                    changeProvider()
+                    return provider.getFee()
+                } else {
+                    return result
+                }
+            }
+        }
+    }
+}
+
+data class XrpInfoResponse(
+        val balance: BigDecimal = BigDecimal.ZERO,
+        val sequence: Long = 0,
+        val hasUnconfirmed: Boolean = false,
+        val reserveBase: BigDecimal,
+        val accountFound: Boolean = true
+)
+
+data class XrpFeeResponse(
+        val minimalFee: BigDecimal,
+        val normalFee: BigDecimal,
+        val priorityFee: BigDecimal
+)
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/xrp/network/rippled/RippledApi.kt b/blockchain/src/main/java/com/tangem/blockchain/xrp/network/rippled/RippledApi.kt
new file mode 100644
index 0000000000..e881830e69
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/xrp/network/rippled/RippledApi.kt
@@ -0,0 +1,38 @@
+package com.tangem.blockchain.xrp.network.rippled
+
+import retrofit2.http.Body
+import retrofit2.http.Headers
+import retrofit2.http.POST
+
+interface RippledApi {
+    @Headers("Content-Type: application/json")
+    @POST("./")
+    suspend fun getAccount(@Body rippledBody: RippledBody): RippledAccountResponse
+
+    @Headers("Content-Type: application/json")
+    @POST("./")
+    suspend fun getServerState(@Body rippledBody: RippledBody = serverStateBody): RippledStateResponse
+
+    @Headers("Content-Type: application/json")
+    @POST("./")
+    suspend fun getFee(@Body rippledBody: RippledBody = feeBody): RippledFeeResponse
+
+    @Headers("Content-Type: application/json")
+    @POST("./")
+    suspend fun submitTransaction(@Body rippledBody: RippledBody): RippledSubmitResponse
+}
+
+enum class RippledMethod(val value: String) {
+    ACCOUNT_INFO("account_info"),
+    SERVER_STATE("server_state"),
+    FEE("fee"),
+    SUBMIT("submit")
+}
+
+data class RippledBody(
+        val method: String,
+        val params: HashMap<String, String> = HashMap() //TODO =null?
+)
+
+val serverStateBody = RippledBody(RippledMethod.SERVER_STATE.value)
+val feeBody = RippledBody(RippledMethod.FEE.value)
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/xrp/network/rippled/RippledProvider.kt b/blockchain/src/main/java/com/tangem/blockchain/xrp/network/rippled/RippledProvider.kt
new file mode 100644
index 0000000000..ee0c499ce0
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/xrp/network/rippled/RippledProvider.kt
@@ -0,0 +1,101 @@
+package com.tangem.blockchain.xrp.network.rippled
+
+import com.tangem.blockchain.common.Blockchain
+import com.tangem.blockchain.common.extensions.Result
+import com.tangem.blockchain.common.extensions.SimpleResult
+import com.tangem.blockchain.common.extensions.retryIO
+import com.tangem.blockchain.xrp.network.XrpFeeResponse
+import com.tangem.blockchain.xrp.network.XrpInfoResponse
+import kotlinx.coroutines.async
+import kotlinx.coroutines.coroutineScope
+import java.math.BigDecimal
+
+class RippledProvider(private val api: RippledApi) {
+    private val decimals = Blockchain.XRP.decimals.toInt()
+
+    suspend fun getInfo(address: String): Result<XrpInfoResponse> {
+        return try {
+            coroutineScope {
+                val accountBody = makeAccountBody(address, validated = true)
+                val accountDeferred = retryIO { async { api.getAccount(accountBody) } }
+
+                val unconfirmedBody = makeAccountBody(address, validated = false)
+                val unconfirmedDeferred = retryIO { async { api.getAccount(unconfirmedBody) } }
+
+                val stateDeferred = retryIO { async { api.getServerState() } }
+
+                val accountData = accountDeferred.await()
+                val unconfirmedData = unconfirmedDeferred.await()
+                val serverState = stateDeferred.await()
+
+                val reserveBase = serverState.result!!.state!!.validatedLedger!!.reserveBase!!
+                        .toBigDecimal().movePointLeft(decimals)
+
+                if (accountData.result!!.errorCode == 19) {
+                    Result.Success(XrpInfoResponse(
+                            reserveBase = reserveBase,
+                            accountFound = false
+                    ))
+                } else {
+                    val confirmedBalance =
+                            accountData.result!!.accountData!!.balance!!.toBigDecimal()
+                                    .movePointLeft(decimals)
+                    val unconfirmedBalance =
+                            unconfirmedData.result!!.accountData!!.balance!!.toBigDecimal()
+                                    .movePointLeft(decimals)
+
+                    Result.Success(XrpInfoResponse(
+                            balance = confirmedBalance,
+                            sequence = accountData.result!!.accountData!!.sequence!!,
+                            hasUnconfirmed = confirmedBalance != unconfirmedBalance,
+                            reserveBase = reserveBase
+                    ))
+                }
+
+            }
+        } catch (exception: Exception) {
+            Result.Failure(exception)
+        }
+    }
+
+    suspend fun getFee(): Result<XrpFeeResponse> {
+        return try {
+            val feeData = retryIO { api.getFee() }
+            Result.Success(XrpFeeResponse(
+                    feeData.result!!.feeData!!.minimalFee!!.toBigDecimal().movePointLeft(decimals),
+                    feeData.result!!.feeData!!.normalFee!!.toBigDecimal().movePointLeft(decimals),
+                    feeData.result!!.feeData!!.priorityFee!!.toBigDecimal().movePointLeft(decimals)
+            ))
+        } catch (exception: Exception) {
+            Result.Failure(exception)
+        }
+    }
+
+    suspend fun sendTransaction(transaction: String): SimpleResult {
+        return try {
+            val submitBody = makeSubmitBody(transaction)
+            val submitData = retryIO { api.submitTransaction(submitBody) }
+            if (submitData.result!!.resultCode == 0) {
+                SimpleResult.Success
+            } else {
+                SimpleResult.Failure(Exception(submitData.result!!.resultMessage
+                        ?: submitData.result!!.errorException))
+            }
+        } catch (exception: Exception) {
+            SimpleResult.Failure(exception)
+        }
+    }
+}
+
+private fun makeAccountBody(address: String, validated: Boolean): RippledBody {
+    val params = HashMap<String, String>()
+    params["account"] = address
+    params["ledger_index"] = if (validated) "validated" else "current"
+    return RippledBody(RippledMethod.ACCOUNT_INFO.value, params)
+}
+
+private fun makeSubmitBody(transaction: String): RippledBody {
+    val params = HashMap<String, String>()
+    params["tx_blob"] = transaction
+    return RippledBody(RippledMethod.SUBMIT.value, params)
+}
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/xrp/network/rippled/RippledResponse.kt b/blockchain/src/main/java/com/tangem/blockchain/xrp/network/rippled/RippledResponse.kt
new file mode 100644
index 0000000000..47d91f3634
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/xrp/network/rippled/RippledResponse.kt
@@ -0,0 +1,103 @@
+package com.tangem.blockchain.xrp.network.rippled
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+// Rippled account
+@JsonClass(generateAdapter = true)
+data class RippledAccountResponse(
+        @Json(name = "result")
+        var result: RippledAccountResult? = null
+)
+
+@JsonClass(generateAdapter = true)
+data class RippledAccountResult(
+        @Json(name = "account_data")
+        var accountData: RippledAccountData? = null,
+
+        @Json(name = "error_code")
+        var errorCode: Int? = null
+)
+
+@JsonClass(generateAdapter = true)
+data class RippledAccountData(
+        @Json(name = "Balance")
+        var balance: String? = null,
+
+        @Json(name = "Sequence")
+        var sequence: Long? = null
+)
+
+// Rippled state
+@JsonClass(generateAdapter = true)
+data class RippledStateResponse(
+        @Json(name = "result")
+        var result: RippledStateResult? = null
+)
+
+@JsonClass(generateAdapter = true)
+data class RippledStateResult(
+        @Json(name = "state")
+        var state: RippledState? = null
+)
+
+@JsonClass(generateAdapter = true)
+data class RippledState(
+        @Json(name = "validated_ledger")
+        var validatedLedger: RippledLedger? = null
+)
+
+@JsonClass(generateAdapter = true)
+data class RippledLedger(
+        @Json(name = "reserve_base")
+        var reserveBase: Long? = null
+)
+
+// Rippled fee
+@JsonClass(generateAdapter = true)
+data class RippledFeeResponse(
+        @Json(name = "result")
+        var result: RippledFeeResult? = null
+)
+
+@JsonClass(generateAdapter = true)
+data class RippledFeeResult(
+        @Json(name = "drops")
+        var feeData: RippledFeeData? = null
+)
+
+@JsonClass(generateAdapter = true)
+data class RippledFeeData(
+        //enough to put tx to queue
+        @Json(name = "minimum_fee")
+        var minimalFee: String? = null,
+
+        //enough to put tx to current ledger
+        @Json(name = "open_ledger_fee")
+        var normalFee: String? = null,
+
+        @Json(name = "median_fee")
+        var priorityFee: String? = null
+)
+
+// Rippled submit
+@JsonClass(generateAdapter = true)
+data class RippledSubmitResponse(
+        @Json(name = "result")
+        var result: RippledSubmitResult? = null
+)
+
+@JsonClass(generateAdapter = true)
+data class RippledSubmitResult(
+        @Json(name = "engine_result_code")
+        var resultCode: Int? = null,
+
+        @Json(name = "engine_result_message")
+        var resultMessage: String? = null,
+
+        @Json(name = "error")
+        var error: String? = null,
+
+        @Json(name = "error_exception")
+        var errorException: String? = null
+)
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/xrp/override/XrpBase58.java b/blockchain/src/main/java/com/tangem/blockchain/xrp/override/XrpBase58.java
new file mode 100644
index 0000000000..3ab3f6f16a
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/xrp/override/XrpBase58.java
@@ -0,0 +1,111 @@
+package com.tangem.blockchain.xrp.override;
+
+import java.math.BigInteger;
+
+public class XrpBase58 {
+    private static final char[] BASE58 = "rpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65jkm8oFqi1tuvAxyz".toCharArray();
+
+    private static final int BASE58_CHUNK_DIGITS = 10;//how many base 58 digits fits in long
+    private static final BigInteger BASE58_CHUNK_MOD = BigInteger.valueOf(0x5fa8624c7fba400L); //58^BASE58_CHUNK_DIGITS
+    private static final byte[] BASE58_VALUES = new byte[]{-1, -1, -1, -1, -1, -1, -1, -1, -1, -2, -2, -2, -2, -2, -1, -1,
+            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+            -2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+            -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, -1, -1, -1, -1, -1, -1,
+            -1, 9, 10, 11, 12, 13, 14, 15, 16, -1, 17, 18, 19, 20, 21, -1,
+            22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, -1, -1, -1, -1, -1,
+            -1, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, -1, 44, 45, 46,
+            47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, -1, -1, -1, -1, -1,
+            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
+
+    public static byte[] decodeBase58(String input) {
+        if (input == null) {
+            return null;
+        }
+        input = input.trim();
+        if (input.length() == 0) {
+            return new byte[0];
+        }
+        BigInteger resultNum = BigInteger.ZERO;
+        int nLeadingZeros = 0;
+        while (nLeadingZeros < input.length() && input.charAt(nLeadingZeros) == BASE58[0]) {
+            nLeadingZeros++;
+        }
+        long acc = 0;
+        int nDigits = 0;
+        int p = nLeadingZeros;
+        while (p < input.length()) {
+            int v = BASE58_VALUES[input.charAt(p) & 0xff];
+            if (v >= 0) {
+                acc *= 58;
+                acc += v;
+                nDigits++;
+                if (nDigits == BASE58_CHUNK_DIGITS) {
+                    resultNum = resultNum.multiply(BASE58_CHUNK_MOD).add(BigInteger.valueOf(acc));
+                    acc = 0;
+                    nDigits = 0;
+                }
+                p++;
+            } else {
+                break;
+            }
+        }
+        if (nDigits > 0) {
+            long mul = 58;
+            while (--nDigits > 0) {
+                mul *= 58;
+            }
+            resultNum = resultNum.multiply(BigInteger.valueOf(mul)).add(BigInteger.valueOf(acc));
+        }
+        final int BASE58_SPACE = -2;
+        while (p < input.length() && BASE58_VALUES[input.charAt(p) & 0xff] == BASE58_SPACE) {
+            p++;
+        }
+        if (p < input.length()) {
+            return null;
+        }
+        byte[] plainNumber = resultNum.toByteArray();
+        int plainNumbersOffs = plainNumber[0] == 0 ? 1 : 0;
+        byte[] result = new byte[nLeadingZeros + plainNumber.length - plainNumbersOffs];
+        System.arraycopy(plainNumber, plainNumbersOffs, result, nLeadingZeros, plainNumber.length - plainNumbersOffs);
+        return result;
+    }
+
+    public static String encodeBase58(byte[] input) {
+        if (input == null) {
+            return null;
+        }
+        StringBuilder str = new StringBuilder((input.length * 350) / 256 + 1);
+        BigInteger bn = new BigInteger(1, input);
+        long rem;
+        while (true) {
+            BigInteger[] divideAndRemainder = bn.divideAndRemainder(BASE58_CHUNK_MOD);
+            bn = divideAndRemainder[0];
+            rem = divideAndRemainder[1].longValue();
+            if (bn.compareTo(BigInteger.ZERO) == 0) {
+                break;
+            }
+            for (int i = 0; i < BASE58_CHUNK_DIGITS; i++) {
+                str.append(BASE58[(int) (rem % 58)]);
+                rem /= 58;
+            }
+        }
+        while (rem != 0) {
+            str.append(BASE58[(int) (rem % 58)]);
+            rem /= 58;
+        }
+        str.reverse();
+        int nLeadingZeros = 0;
+        while (nLeadingZeros < input.length && input[nLeadingZeros] == 0) {
+            str.insert(0, BASE58[0]);
+            nLeadingZeros++;
+        }
+        return str.toString();
+    }
+}
\ No newline at end of file
diff --git a/blockchain/src/main/java/com/tangem/blockchain/xrp/override/XrpPayment.java b/blockchain/src/main/java/com/tangem/blockchain/xrp/override/XrpPayment.java
new file mode 100644
index 0000000000..1fa01213a5
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/xrp/override/XrpPayment.java
@@ -0,0 +1,18 @@
+package com.tangem.blockchain.xrp.override;
+
+
+import com.ripple.core.types.known.tx.txns.Payment;
+
+public class XrpPayment extends Payment {
+
+    public XrpPayment() {
+        super();
+    }
+
+    public XrpSignedTransaction prepare(byte[] pubKeyBytes) {
+        XrpSignedTransaction tx = XrpSignedTransaction.fromTx(this);
+        tx.prepare(pubKeyBytes);
+        return tx;
+    }
+
+}
diff --git a/blockchain/src/main/java/com/tangem/blockchain/xrp/override/XrpSignedTransaction.java b/blockchain/src/main/java/com/tangem/blockchain/xrp/override/XrpSignedTransaction.java
new file mode 100644
index 0000000000..926a176adb
--- /dev/null
+++ b/blockchain/src/main/java/com/tangem/blockchain/xrp/override/XrpSignedTransaction.java
@@ -0,0 +1,81 @@
+package com.tangem.blockchain.xrp.override;
+
+import com.ripple.core.coretypes.Amount;
+import com.ripple.core.coretypes.Blob;
+import com.ripple.core.coretypes.STObject;
+import com.ripple.core.coretypes.hash.HalfSha512;
+import com.ripple.core.coretypes.hash.prefixes.HashPrefix;
+import com.ripple.core.coretypes.uint.UInt32;
+import com.ripple.core.serialized.BytesList;
+import com.ripple.core.serialized.MultiSink;
+import com.ripple.core.types.known.tx.Transaction;
+import com.ripple.core.types.known.tx.signed.SignedTransaction;
+
+import java.util.Arrays;
+
+public class XrpSignedTransaction extends SignedTransaction {
+    private XrpSignedTransaction(Transaction of) {
+        txn = (Transaction) STObject.fromBytes(of.toBytes());
+    }
+
+    protected XrpSignedTransaction() {
+    }
+
+    public static XrpSignedTransaction fromTx(Transaction tx) {
+        return new XrpSignedTransaction(tx);
+    }
+
+    public void prepare(byte[] pubKeyBytes) {
+        prepare(pubKeyBytes, null, null, null);
+    }
+
+    public void prepare(byte[] pubKeyBytes,
+                        Amount fee,
+                        UInt32 Sequence,
+                        UInt32 lastLedgerSequence) {
+
+        Blob pubKey = new Blob(pubKeyBytes);
+
+        // This won't always be specified
+        if (lastLedgerSequence != null) {
+            txn.put(UInt32.LastLedgerSequence, lastLedgerSequence);
+        }
+        if (Sequence != null) {
+            txn.put(UInt32.Sequence, Sequence);
+        }
+        if (fee != null) {
+            txn.put(Amount.Fee, fee);
+        }
+
+        txn.signingPubKey(pubKey);
+
+        if (Transaction.CANONICAL_FLAG_DEPLOYED) {
+            txn.setCanonicalSignatureFlag();
+        }
+
+        txn.checkFormat();
+        signingData = txn.signingData();
+        if (previousSigningData != null && Arrays.equals(signingData, previousSigningData)) {
+            return;
+        }
+    }
+
+    public void addSign(byte[] signature) {
+        try {
+            txn.txnSignature(new Blob(signature));
+
+            BytesList blob = new BytesList();
+            HalfSha512 id = HalfSha512.prefixed256(HashPrefix.transactionID);
+
+            txn.toBytesSink(new MultiSink(blob, id));
+            tx_blob = blob.bytesHex();
+            hash = id.finish();
+        } catch (Exception e) {
+            // electric paranoia
+            previousSigningData = null;
+            throw new RuntimeException(e);
+        } /*else {*/
+        previousSigningData = signingData;
+        // }
+    }
+}
diff --git a/blockchain/src/main/res/values/strings.xml b/blockchain/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..4b289d3aaa
--- /dev/null
+++ b/blockchain/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Blockchain</string>
+</resources>
diff --git a/blockchain/src/test/java/com/tangem/blockchain/bitcoin/BitcoinAddressTest.kt b/blockchain/src/test/java/com/tangem/blockchain/bitcoin/BitcoinAddressTest.kt
new file mode 100644
index 0000000000..ea4b181980
--- /dev/null
+++ b/blockchain/src/test/java/com/tangem/blockchain/bitcoin/BitcoinAddressTest.kt
@@ -0,0 +1,25 @@
+package com.tangem.blockchain.bitcoin
+
+import com.google.common.truth.Truth
+import com.tangem.common.extensions.hexToBytes
+import org.junit.Test
+import org.junit.jupiter.api.Assertions.*
+
+class BitcoinAddressTest {
+
+    @Test
+    fun makeAddressFromCorrectPublicKey() {
+        val walletPublicKey = "04752A727E14BBA5BD73B6714D72500F61FFD11026AD1196D2E1C54577CBEEAC3D11FC68A64700F8D533F4E311964EA8FB3AA26C588295F2133868D69C3E628693".hexToBytes()
+        val expected = "1D3vYSjCvzrsVVK5bNaPTjU3NxcN7NNXMN"
+
+        Truth.assertThat(BitcoinAddressFactory.makeAddress(walletPublicKey))
+                .isEqualTo(expected)
+    }
+
+    @Test
+    fun validateCorrectAddress() {
+        val address = "1D3vYSjCvzrsVVK5bNaPTjU3NxcN7NNXMN"
+        Truth.assertThat(BitcoinAddressValidator.validate(address))
+                .isTrue()
+    }
+}
\ No newline at end of file
diff --git a/blockchain/src/test/java/com/tangem/blockchain/common/WalletManagerFactoryTest.kt b/blockchain/src/test/java/com/tangem/blockchain/common/WalletManagerFactoryTest.kt
new file mode 100644
index 0000000000..a476130557
--- /dev/null
+++ b/blockchain/src/test/java/com/tangem/blockchain/common/WalletManagerFactoryTest.kt
@@ -0,0 +1,71 @@
+package com.tangem.blockchain.common
+
+import com.google.common.truth.Truth
+import com.tangem.common.CardEnvironment
+import com.tangem.blockchain.bitcoin.BitcoinWalletManager
+import com.tangem.blockchain.cardano.CardanoWalletManager
+import com.tangem.blockchain.ethereum.EthereumWalletManager
+import com.tangem.blockchain.stellar.StellarWalletManager
+import com.tangem.blockchain.xrp.XrpWalletManager
+import com.tangem.commands.ReadCommand
+import com.tangem.common.apdu.ResponseApdu
+import com.tangem.common.extensions.hexToBytes
+import org.junit.Test
+
+internal class WalletManagerFactoryTest {
+
+    @Test
+    fun createBitcoinWalletManager() {
+        val data = "0108bb00000000000304200754414e47454d00020102800a322e3432642053444b000341040876bdec26b89bd2159a668b9af3d9fe86370f318717c92b8d6c1186fb3648c32a5f9321998cc2d042901c91d40601e79a641e1cbcebe7a2358be6054e1b6e5d0a04041e76310c618102ffff8a0101820407e30b0d830b54414e47454d2053444b0084034254438640e17ceec48c5be36240c98019f95ad8b6e56acfebe60d11979c6279f715d607d76a860a137da8d109e805753f3f56b0130709f4bbf4cb9974b4c57b8469bf4b873041045f16bd1d2eafe463e62a335a09e6b2bbcbd04452526885cb679fc4d27af1bd22f553c7deefb54fd3d4f361d14e6dc3f11b7d4ea183250a60720ebdf9e110cd26050a736563703235366b310008040000006407010009020bb8604104752a727e14bba5bd73b6714d72500f61ffd11026ad1196d2e1c54577cbeeac3d11fc68a64700f8d533f4e311964ea8fb3aa26c588295f2133868d69c3e62869362040000005c6304000000090f01009000"
+        val responseApdu = ResponseApdu(data.hexToBytes())
+        val card = ReadCommand().deserialize(CardEnvironment(), responseApdu)
+        val walletManager = WalletManagerFactory.makeWalletManager(card!!)
+
+        Truth.assertThat(walletManager)
+                .isInstanceOf(BitcoinWalletManager::class.java)
+    }
+
+    @Test
+    fun createEthereumWalletManager() {
+        val data = "0108bb00000000000536200754414e47454d00020102800a322e3432642053444b000341046c8aea0d5a850b0a608acf9a0c453c39ea86131e88bfa78800de3cfb5bf1007aeaa7b9ffc184212255758605c2461be343c0a661d73cabafa4c9c175b3f0e59a0a04041e76310c618102ffff8a0101820407e30b0d830b54414e47454d2053444b0084034554488640431b6244acfeac479becdff201a7f720a7d70a97edc4e019fb678596baf52dfe9d0e8faf08ceb4443b82d4e66815541f2dc8ec6dd3ff83eb42f06e5eab07f25f3041045f16bd1d2eafe463e62a335a09e6b2bbcbd04452526885cb679fc4d27af1bd22f553c7deefb54fd3d4f361d14e6dc3f11b7d4ea183250a60720ebdf9e110cd26050a736563703235366b3100080400000064070100090205dc60410464dddc3f356744aaecfa07427f9eb996ff537d65f20fb5be3abccf0354352a6b5f8a1942e0f8ddeea3a170eda78d060be8162ad60e94e4e91fbbdf0a7054785562040000005b6304000000090f01009000"
+        val responseApdu = ResponseApdu(data.hexToBytes())
+        val card = ReadCommand().deserialize(CardEnvironment(), responseApdu)
+        val walletManager = WalletManagerFactory.makeWalletManager(card!!)
+
+        Truth.assertThat(walletManager)
+                .isInstanceOf(EthereumWalletManager::class.java)
+    }
+
+    @Test
+    fun createStellarWalletManager() {
+        val data = "0108bb00000000000379200754414e47454d00020102800a322e3432642053444b0003410487d7bb51b189213e3cedc3fcfa3fc047b3b71b7805b5b215e14639b3a8ebb1952c9dd5ea4354441b6ada4e8b8327674bb102ddae69df55be69643a2c916edf650a04041e76310c618102ffff8a0101820407e30b0d830b54414e47454d2053444b008403584c4d86409a4bc2baf0e5836887da21167cf33458d5249d1a610bced0e31dc053f23729ed24d715912bf89e6804669430dfe396ed83274e0031f6803e2bdb8c041fa993413041045f16bd1d2eafe463e62a335a09e6b2bbcbd04452526885cb679fc4d27af1bd22f553c7deefb54fd3d4f361d14e6dc3f11b7d4ea183250a60720ebdf9e110cd2605086564323535313900080400000064070100090205dc6020e078212d58b2b9d0edc9c936830d10081cd38b90c31778c56dfb1171027e294e62040000003863040000002c0f01009000"
+        val responseApdu = ResponseApdu(data.hexToBytes())
+        val card = ReadCommand().deserialize(CardEnvironment(), responseApdu)
+        val walletManager = WalletManagerFactory.makeWalletManager(card!!)
+
+        Truth.assertThat(walletManager)
+                .isInstanceOf(StellarWalletManager::class.java)
+    }
+
+    @Test
+    fun createCardanoWalletManager() {
+        val data = "0108bb00000000000502200754414e47454d00020102800a322e3432642053444b0003410402c1e39257d60583489da2d67d35d1cc2a1c005cc05c1021f44838edcaf25d5615cad7c9d11c2e23f5efa93e50904d33c88808d0e169060508df840992e31f4d0a04041e76310c658102ffff8a0101820407e30b0d830b54414e47454d2053444b00840743415244414e4f8640f24ef5c8c6eba0ff97560d5b013edb4a452594270db9647bd0a3543df8104dec75731d4db3ebe0fc493f2afee00195e560b51e3c41189b7c61ba7895d6434b9d3041045f16bd1d2eafe463e62a335a09e6b2bbcbd04452526885cb679fc4d27af1bd22f553c7deefb54fd3d4f361d14e6dc3f11b7d4ea183250a60720ebdf9e110cd2605086564323535313900080400000064070100090205dc60208a71161cfdf1e0a85d8e7ff372aa4a01136046292aceb5f9ad7ebdb98d3f60a86204000000646304000000000f01009000"
+        val responseApdu = ResponseApdu(data.hexToBytes())
+        val card = ReadCommand().deserialize(CardEnvironment(), responseApdu)
+        val walletManager = WalletManagerFactory.makeWalletManager(card!!)
+
+        Truth.assertThat(walletManager)
+                .isInstanceOf(CardanoWalletManager::class.java)
+    }
+
+    @Test
+    fun createXrpWalletManager() {
+        val data = "0108cb21000000002154200b534d4152542043415348000201028006322e31317200034104bdad63848f97c535da53cf8fd300d24fa33f0516d194aa78ec164a06994d00204bae243a424e316c6ec845e02d9b15eafae8c19018a926b0b7435e6e941cdadb0a0400007e210c5a81020028820407e30502830754414e47454d00840358525086400ed8734b877869722c7d0b37ffb154b9fef21c54bf2c6496feb1fb5c1fc28a2ac28e201dde84f27495fa7f08b3ca2be2fb4954bf0fe78af027d6cdc16c3eee923041048196aa4b410ac44a3b9cce18e7be226aea070acc83a9cf67540fac49af25129f6a538a28ad6341358e3c4f9963064f7e365372a651d374e5c23cdd37fd099bf2050a736563703235366b31000804000f4240070100090205dc604104d2b9fb288540d54e5b32ecaf0381cd571f97f6f1ecd036b66bb11aa52ffe9981110d883080e2e255c6b1640586f7765e6faa325d1340f49b56b83d9de56bc7ed6204000f42406304000000000f01009000"
+        val responseApdu = ResponseApdu(data.hexToBytes())
+        val card = ReadCommand().deserialize(CardEnvironment(), responseApdu)
+        val walletManager = WalletManagerFactory.makeWalletManager(card!!)
+
+        Truth.assertThat(walletManager)
+                .isInstanceOf(XrpWalletManager::class.java)
+    }
+}
\ No newline at end of file
diff --git a/blockchain/src/test/java/com/tangem/blockchain/ethereum/EthereumAddressTest.kt b/blockchain/src/test/java/com/tangem/blockchain/ethereum/EthereumAddressTest.kt
new file mode 100644
index 0000000000..b1325c8493
--- /dev/null
+++ b/blockchain/src/test/java/com/tangem/blockchain/ethereum/EthereumAddressTest.kt
@@ -0,0 +1,24 @@
+package com.tangem.blockchain.ethereum
+
+import com.google.common.truth.Truth
+import com.tangem.common.extensions.hexToBytes
+import org.junit.Test
+
+internal class EthereumAddressTest {
+
+    @Test
+    fun makeAddressFromCorrectPublicKey() {
+        val walletPublicKey = "04BAEC8CD3BA50FDFE1E8CF2B04B58E17041245341CD1F1C6B3A496B48956DB4C896A6848BCF8FCFC33B88341507DD25E5F4609386C68086C74CF472B86E5C3820".hexToBytes()
+        val expected = "0xc63763572d45171e4c25ca0818b44e5dd7f5c15b"
+
+        Truth.assertThat(EthereumAddressFactory.makeAddress(walletPublicKey))
+                .isEqualTo(expected)
+    }
+
+    @Test
+    fun validateCorrectAddress() {
+        val address = "0xc63763572d45171e4c25ca0818b44e5dd7f5c15b"
+        Truth.assertThat(EthereumAddressValidator.validate(address))
+                .isTrue()
+    }
+}
\ No newline at end of file
diff --git a/blockchain/src/test/java/com/tangem/blockchain/stellar/StellarAddressTest.kt b/blockchain/src/test/java/com/tangem/blockchain/stellar/StellarAddressTest.kt
new file mode 100644
index 0000000000..5c6f18561f
--- /dev/null
+++ b/blockchain/src/test/java/com/tangem/blockchain/stellar/StellarAddressTest.kt
@@ -0,0 +1,23 @@
+package com.tangem.blockchain.stellar
+
+import com.google.common.truth.Truth
+import com.tangem.common.extensions.hexToBytes
+import org.junit.Test
+
+internal class StellarAddressTest {
+    @Test
+    fun makeAddressFromCorrectPublicKey() {
+        val walletPublicKey = "EC5387D8B38BD9EF80BDBC78D0D7E1C53F08E269436C99D5B3C2DF4B2CE73012".hexToBytes()
+        val expected = "GDWFHB6YWOF5T34AXW6HRUGX4HCT6CHCNFBWZGOVWPBN6SZM44YBFUDZ"
+
+        Truth.assertThat(StellarAddressFactory.makeAddress(walletPublicKey))
+                .isEqualTo(expected)
+    }
+
+    @Test
+    fun validateCorrectAddress() {
+        val address = "GDWFHB6YWOF5T34AXW6HRUGX4HCT6CHCNFBWZGOVWPBN6SZM44YBFUDZ"
+        Truth.assertThat(StellarAddressValidator.validate(address))
+                .isTrue()
+    }
+}
\ No newline at end of file
diff --git a/blockchain/src/test/java/com/tangem/blockchain/xrp/XrpAddressTest.kt b/blockchain/src/test/java/com/tangem/blockchain/xrp/XrpAddressTest.kt
new file mode 100644
index 0000000000..1f82c1f777
--- /dev/null
+++ b/blockchain/src/test/java/com/tangem/blockchain/xrp/XrpAddressTest.kt
@@ -0,0 +1,32 @@
+package com.tangem.blockchain.xrp
+
+import com.google.common.truth.Truth
+import com.tangem.common.extensions.hexToBytes
+import org.junit.Test
+
+internal class XrpAddressTest {
+    @Test
+    fun makeAddressFromCorrectSecpPublicKey() {
+        val walletPublicKey = "04D2B9FB288540D54E5B32ECAF0381CD571F97F6F1ECD036B66BB11AA52FFE9981110D883080E2E255C6B1640586F7765E6FAA325D1340F49B56B83D9DE56BC7ED".hexToBytes()
+        val expected = "rNxCXgKaCMAmowENKnYa5r8Ue78rjgrM6B"
+
+        Truth.assertThat(XrpAddressFactory.makeAddress(walletPublicKey))
+                .isEqualTo(expected)
+    }
+
+    @Test
+    fun makeAddressFromCorrectEdPublicKey() {
+        val walletPublicKey = "12CC4DE73BACF875D7423D152E46C1A665F1718CBE7CA0FEB2BA28C149E11909".hexToBytes()
+        val expected = "rwWMNBs2GtJwfX7YNVV1sUYaPy6DRmDHB4"
+
+        Truth.assertThat(XrpAddressFactory.makeAddress(walletPublicKey))
+                .isEqualTo(expected)
+    }
+
+    @Test
+    fun validateCorrectAddress() {
+        val address = "rwWMNBs2GtJwfX7YNVV1sUYaPy6DRmDHB4"
+        Truth.assertThat(XrpAddressValidator.validate(address))
+                .isTrue()
+    }
+}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index dde59cbded..c8bd6efacd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,15 +1,15 @@
 buildscript {
-    ext.kotlin_version = '1.3.61'
+    apply from: 'dependencies.gradle'
+
     repositories {
         google()
         jcenter()
         maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'io.fabric.tools:gradle:1.31.0'
+        classpath "com.android.tools.build:gradle:$versions.build_gradle"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"
+        classpath "io.fabric.tools:gradle:1.31.0"
     }
 }
 
diff --git a/dependencies.gradle b/dependencies.gradle
new file mode 100644
index 0000000000..54a6d70a21
--- /dev/null
+++ b/dependencies.gradle
@@ -0,0 +1,4 @@
+ext.versions = [
+        kotlin      : '1.3.61',
+        build_gradle: '3.6.0',
+]
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index cc53da309f..3e4d7dcd2a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Aug 22 12:21:00 MSK 2019
+#Thu Feb 27 13:33:42 AST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/jitpack.gradle b/jitpack.gradle
new file mode 100644
index 0000000000..cd263447fd
--- /dev/null
+++ b/jitpack.gradle
@@ -0,0 +1,4 @@
+ext.jitpackSdk = [
+        group: 'com.github.Tangem',
+        version  : '0.2.1',
+]
\ No newline at end of file
diff --git a/server-android/build.gradle b/server-android/build.gradle
index 05ebb488ca..a853878415 100644
--- a/server-android/build.gradle
+++ b/server-android/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'com.github.dcendents.android-maven'
 
 group='com.tangem'
 
@@ -41,7 +40,7 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
 }
 repositories {
     mavenCentral()
diff --git a/settings.gradle b/settings.gradle
index e060f73444..6f8af10c4a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':tangem-sdk-old', ':server-android', ':tangem-card-old', ':tangem-core', ':tangem-sdk', ':tangem-demo'
+include ':app', ':tangem-sdk-old', ':server-android', ':tangem-card-old', ':tangem-core', ':tangem-sdk', ':tangem-demo', ':blockchain'
diff --git a/tangem-card-old/build.gradle b/tangem-card-old/build.gradle
index f0d27f4bee..affd0bb0f3 100644
--- a/tangem-card-old/build.gradle
+++ b/tangem-card-old/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'java-library'
-apply plugin: 'com.github.dcendents.android-maven'
 
 group='com.tangem'
 
diff --git a/tangem-core/build.gradle b/tangem-core/build.gradle
index e3cb3b5cba..a831d40268 100644
--- a/tangem-core/build.gradle
+++ b/tangem-core/build.gradle
@@ -1,31 +1,33 @@
 apply plugin: "kotlin"
 apply plugin: 'org.jetbrains.dokka'
+apply from: '../dependencies.gradle'
+apply from: '../jitpack.gradle'
 
-group = 'com.github.TangemCash'
-version '0.1.0'
+group = "$jitpackSdk.group"
+version "$jitpackSdk.version"
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation "com.madgag.spongycastle:core:1.56.0.0"
-    implementation "com.madgag.spongycastle:prov:1.56.0.0"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
+    implementation "com.madgag.spongycastle:core:1.58.0.0"
+    implementation "com.madgag.spongycastle:prov:1.58.0.0"
     implementation 'net.i2p.crypto:eddsa:0.3.0'
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.2'
     testImplementation "com.google.truth:truth:1.0"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:1.3.61"
 }
 
 sourceCompatibility = "8"
 targetCompatibility = "8"
 
 buildscript {
-    ext.kotlin_version = '1.3.50'
     ext.dokka_version = '0.10.0'
     repositories {
         mavenCentral()
         jcenter()
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
     }
 }
diff --git a/tangem-core/src/main/java/com/tangem/CardManager.kt b/tangem-core/src/main/java/com/tangem/CardManager.kt
index e381f57e3d..4094d935bc 100644
--- a/tangem-core/src/main/java/com/tangem/CardManager.kt
+++ b/tangem-core/src/main/java/com/tangem/CardManager.kt
@@ -1,6 +1,8 @@
 package com.tangem
 
 import com.tangem.commands.*
+import com.tangem.common.CardEnvironment
+import com.tangem.common.TerminalKeysService
 import com.tangem.crypto.CryptoUtils
 import com.tangem.tasks.*
 import java.util.concurrent.Executors
@@ -16,10 +18,12 @@ import java.util.concurrent.Executors
  */
 class CardManager(
         private val reader: CardReader,
-        private val cardManagerDelegate: CardManagerDelegate? = null) {
+        private val cardManagerDelegate: CardManagerDelegate? = null,
+        private val config: Config = Config()
+) {
 
+    private var terminalKeysService: TerminalKeysService? = null
     private var isBusy = false
-    private val cardEnvironmentRepository = mutableMapOf<String, CardEnvironment>()
     private val cardManagerExecutor = Executors.newSingleThreadExecutor()
 
     init {
@@ -67,12 +71,13 @@ class CardManager(
              callback: (result: TaskEvent<SignResponse>) -> Unit) {
         val signCommand: SignCommand
         try {
-            signCommand = SignCommand(hashes, cardId)
+            signCommand = SignCommand(hashes)
         } catch (error: Exception) {
             if (error is TaskError) {
                 callback(TaskEvent.Completion(error))
             } else {
-                callback(TaskEvent.Completion(TaskError.GenericError(error.message)))
+                Log.e(this::class.simpleName!!, error.message ?: "")
+                callback(TaskEvent.Completion(TaskError.UnknownError()))
             }
             return
         }
@@ -91,8 +96,23 @@ class CardManager(
      */
     fun readIssuerData(cardId: String,
                        callback: (result: TaskEvent<ReadIssuerDataResponse>) -> Unit) {
-        val getIssuerDataCommand = ReadIssuerDataCommand(cardId)
-        val task = SingleCommandTask(getIssuerDataCommand)
+        val task = ReadIssuerDataTask(config.issuerPublicKey)
+        runTask(task, cardId, callback)
+    }
+
+    /**
+     * This task retrieves Issuer Extra Data field and its issuer’s signature.
+     * Issuer Extra Data is never changed or parsed from within the Tangem COS. The issuer defines purpose of use,
+     * format and payload of Issuer Data. . For example, this field may contain photo or
+     * biometric information for ID card product. Because of the large size of Issuer_Extra_Data,
+     * a series of these commands have to be executed to read the entire Issuer_Extra_Data.
+     * @param cardId CID, Unique Tangem card ID number.
+     * @param callback is triggered on the completion of the [ReadIssuerExtraDataTask],
+     * provides card response in the form of [ReadIssuerExtraDataResponse].
+     */
+    fun readIssuerExtraData(cardId: String,
+                            callback: (result: TaskEvent<ReadIssuerExtraDataResponse>) -> Unit) {
+        val task = ReadIssuerExtraDataTask(config.issuerPublicKey)
         runTask(task, cardId, callback)
     }
 
@@ -103,7 +123,7 @@ class CardManager(
      * wallet balance signed by the issuer or additional issuer’s attestation data.
      * @param cardId CID, Unique Tangem card ID number.
      * @param issuerData Data provided by issuer.
-     * @param issuerDataSignature Issuer’s signature of [issuerData] with Issuer Data Private Key (which is kept on card).
+     * @param issuerDataSignature Issuer’s signature of [issuerData] with Issuer Data Private Key.
      * @param issuerDataCounter An optional counter that protect issuer data against replay attack.
      * @param callback is triggered on the completion of the [WriteIssuerDataCommand],
      * provides card response in the form of [WriteIssuerDataResponse].
@@ -113,15 +133,89 @@ class CardManager(
                         issuerDataSignature: ByteArray,
                         issuerDataCounter: Int? = null,
                         callback: (result: TaskEvent<WriteIssuerDataResponse>) -> Unit) {
-        val writeIssuerDataCommand = WriteIssuerDataCommand(
-                    cardId,
-                    issuerData,
-                    issuerDataSignature,
-                    issuerDataCounter)
-        val task = SingleCommandTask(writeIssuerDataCommand)
+        val task = WriteIssuerDataTask(
+                issuerData,
+                issuerDataSignature,
+                issuerDataCounter,
+                config.issuerPublicKey
+        )
         runTask(task, cardId, callback)
     }
 
+    /**
+     * This task writes Issuer Extra Data field and its issuer’s signature.
+     * Issuer Extra Data is never changed or parsed from within the Tangem COS.
+     * The issuer defines purpose of use, format and payload of Issuer Data.
+     * For example, this field may contain a photo or biometric information for ID card products.
+     * Because of the large size of Issuer_Extra_Data, a series of these commands have to be executed
+     * to write entire Issuer_Extra_Data.
+     * @param cardId CID, Unique Tangem card ID number.
+     * @param issuerData Data provided by issuer.
+     * @param startingSignature Issuer’s signature with Issuer Data Private Key of [cardId],
+     * [issuerDataCounter] (if flags Protect_Issuer_Data_Against_Replay and
+     * Restrict_Overwrite_Issuer_Extra_Data are set in [SettingsMask]) and size of [issuerData].
+     * @param finalizingSignature Issuer’s signature with Issuer Data Private Key of [cardId],
+     * [issuerData] and [issuerDataCounter] (the latter one only if flags Protect_Issuer_Data_Against_Replay
+     * andRestrict_Overwrite_Issuer_Extra_Data are set in [SettingsMask]).
+     * @param issuerDataCounter An optional counter that protect issuer data against replay attack.
+     * @param callback is triggered on the completion of the [WriteIssuerDataCommand],
+     * provides card response in the form of [WriteIssuerDataResponse].
+     */
+    fun writeIssuerExtraData(cardId: String,
+                             issuerData: ByteArray,
+                             startingSignature: ByteArray,
+                             finalizingSignature: ByteArray,
+                             issuerDataCounter: Int? = null,
+                             callback: (result: TaskEvent<WriteIssuerDataResponse>) -> Unit) {
+        val task = WriteIssuerExtraDataTask(
+                issuerData,
+                startingSignature, finalizingSignature,
+                config.issuerPublicKey,
+                issuerDataCounter
+        )
+        runTask(task, cardId, callback)
+    }
+
+    /**
+     * This command write some of User_Data, User_ProtectedData, User_Counter and User_ProtectedCounter fields.
+     * User_Data and User_ProtectedData are never changed or parsed by the executable code the Tangem COS.
+     * The App defines purpose of use, format and it's payload. For example, this field may contain cashed information
+     * from blockchain to accelerate preparing new transaction.
+     * User_Counter and User_ProtectedCounter are counters, that initial values can be set by App and increased on every signing
+     * of new transaction (on SIGN command that calculate new signatures). The App defines purpose of use.
+     * For example, this fields may contain blockchain nonce value.
+     *
+     * Writing of User_Counter and User_Data protected only by PIN1.
+     * User_ProtectedCounter and User_ProtectedData additionaly need PIN2 to confirmation.
+     */
+    fun writeUserData(
+        cardId: String,
+        userData: ByteArray? = null,
+        userProtectedData: ByteArray? = null,
+        userCounter: Int? = null,
+        userProtectedCounter: Int? = null,
+        callback: (result: TaskEvent<WriteUserDataResponse>) -> Unit
+    ) {
+      val writeUserDataCommand = WriteUserDataCommand(userData, userProtectedData, userCounter, userProtectedCounter)
+      val task = SingleCommandTask(writeUserDataCommand)
+      runTask(task, cardId, callback)
+    }
+
+    /**
+     * This command returns two up to 512-byte User_Data, User_Protected_Data and two counters User_Counter and
+     * User_Protected_Counter fields.
+     * User_Data and User_ProtectedData are never changed or parsed by the executable code the Tangem COS.
+     * The App defines purpose of use, format and it's payload. For example, this field may contain cashed information
+     * from blockchain to accelerate preparing new transaction.
+     * User_Counter and User_ProtectedCounter are counters, that initial values can be set by App and increased on every signing
+     * of new transaction (on SIGN command that calculate new signatures). The App defines purpose of use.
+     * For example, this fields may contain blockchain nonce value.
+     */
+    fun readUserData(cardId: String, callback: (result: TaskEvent<ReadUserDataResponse>) -> Unit) {
+      val task = SingleCommandTask(ReadUserDataCommand())
+      runTask(task, cardId, callback)
+    }
+
     /**
      * This command will create a new wallet on the card having ‘Empty’ state.
      * A key pair WalletPublicKey / WalletPrivateKey is generated and securely stored in the card.
@@ -134,7 +228,7 @@ class CardManager(
      */
     fun createWallet(cardId: String,
                      callback: (result: TaskEvent<CreateWalletResponse>) -> Unit) {
-        val createWalletCommand = CreateWalletCommand(cardId)
+        val createWalletCommand = CreateWalletCommand()
         val task = SingleCommandTask(createWalletCommand)
         runTask(task, cardId, callback)
     }
@@ -148,7 +242,7 @@ class CardManager(
      */
     fun purgeWallet(cardId: String,
                     callback: (result: TaskEvent<PurgeWalletResponse>) -> Unit) {
-        val purgeWalletCommand = PurgeWalletCommand(cardId)
+        val purgeWalletCommand = PurgeWalletCommand()
         val task = SingleCommandTask(purgeWalletCommand)
         runTask(task, cardId, callback)
     }
@@ -156,14 +250,13 @@ class CardManager(
     /**
 
      */
-    fun <T> runTask(task: Task<T>, cardId: String? = null,
-                    callback: (result: TaskEvent<T>) -> Unit) {
+    fun <T> runTask(task: Task<T>, cardId: String? = null, callback: (result: TaskEvent<T>) -> Unit) {
         if (isBusy) {
             callback(TaskEvent.Completion(TaskError.Busy()))
             return
         }
 
-        val environment = fetchCardEnvironment(cardId)
+        val environment = prepareCardEnvironment(cardId)
         isBusy = true
 
         task.reader = reader
@@ -187,7 +280,21 @@ class CardManager(
         runTask(task, cardId, callback)
     }
 
-    private fun fetchCardEnvironment(cardId: String?): CardEnvironment {
-        return cardEnvironmentRepository[cardId] ?: CardEnvironment(cardId = cardId)
+    /**
+     * Allows to set a particular [TerminalKeysService] to retrieve terminal keys.
+     * Default implementation is provided in tangem-sdk module: [TerminalKeysStorage].
+     */
+    fun setTerminalKeysService(terminalKeysService: TerminalKeysService) {
+        this.terminalKeysService = terminalKeysService
     }
+
+    private fun prepareCardEnvironment(cardId: String?): CardEnvironment {
+        val terminalKeys = if (config.linkedTerminal) terminalKeysService?.getKeys() else null
+        return CardEnvironment(
+                cardId = cardId,
+                terminalKeys = terminalKeys
+        )
+    }
+
+    companion object
 }
\ No newline at end of file
diff --git a/tangem-core/src/main/java/com/tangem/CardManagerDelegate.kt b/tangem-core/src/main/java/com/tangem/CardManagerDelegate.kt
index 52f30a5e91..5fce77186d 100644
--- a/tangem-core/src/main/java/com/tangem/CardManagerDelegate.kt
+++ b/tangem-core/src/main/java/com/tangem/CardManagerDelegate.kt
@@ -13,13 +13,19 @@ interface CardManagerDelegate {
     /**
      * It is called when user is expected to scan a Tangem Card with an Android device.
      */
-    fun onNfcSessionStarted()
+    fun onNfcSessionStarted(cardId: String?)
 
     /**
      * It is called when security delay is triggered by the card.
      * A user is expected to hold the card until the security delay is over.
      */
-    fun onSecurityDelay(ms: Int)
+    fun onSecurityDelay(ms: Int, totalDurationSeconds: Int)
+
+    /**
+     * It is called when long tasks are performed.
+     * A user is expected to hold the card until the task is complete.
+     */
+    fun onDelay(total: Int, current: Int, step: Int)
 
     /**
      * It is called when user takes the card away from the Android device during the scanning
@@ -35,7 +41,7 @@ interface CardManagerDelegate {
     /**
      * It is called when some error occur during NFC session.
      */
-    fun onError(error: TaskError? = null)
+    fun onError(error: TaskError)
 
     /**
      * It is called when a user is expected to enter pin code.
diff --git a/tangem-core/src/main/java/com/tangem/Config.kt b/tangem-core/src/main/java/com/tangem/Config.kt
new file mode 100644
index 0000000000..2d1193e176
--- /dev/null
+++ b/tangem-core/src/main/java/com/tangem/Config.kt
@@ -0,0 +1,6 @@
+package com.tangem
+
+class Config(
+        val linkedTerminal: Boolean = true,
+        val issuerPublicKey: ByteArray? = null
+)
\ No newline at end of file
diff --git a/tangem-core/src/main/java/com/tangem/commands/CheckWalletCommand.kt b/tangem-core/src/main/java/com/tangem/commands/CheckWalletCommand.kt
index 1fc2521d2d..e5376f2cc7 100644
--- a/tangem-core/src/main/java/com/tangem/commands/CheckWalletCommand.kt
+++ b/tangem-core/src/main/java/com/tangem/commands/CheckWalletCommand.kt
@@ -1,14 +1,16 @@
 package com.tangem.commands
 
-import com.tangem.CardEnvironment
+import com.tangem.common.CardEnvironment
 import com.tangem.common.apdu.CommandApdu
 import com.tangem.common.apdu.Instruction
 import com.tangem.common.apdu.ResponseApdu
 import com.tangem.common.extensions.calculateSha256
 import com.tangem.common.extensions.hexToBytes
 import com.tangem.common.tlv.Tlv
+import com.tangem.common.tlv.TlvBuilder
 import com.tangem.common.tlv.TlvMapper
 import com.tangem.common.tlv.TlvTag
+import com.tangem.crypto.CryptoUtils
 import com.tangem.tasks.TaskError
 
 /**
@@ -22,7 +24,16 @@ class CheckWalletResponse(
         val cardId: String,
         val salt: ByteArray,
         val walletSignature: ByteArray
-) : CommandResponse
+) : CommandResponse {
+
+    fun verify(curve: EllipticCurve, publicKey: ByteArray, challenge: ByteArray): Boolean {
+        return CryptoUtils.verify(
+                publicKey,
+                challenge + salt,
+                walletSignature,
+                curve)
+    }
+}
 
 /**
  * This command proves that the wallet private key from the card corresponds to the wallet public key.
@@ -32,18 +43,16 @@ class CheckWalletResponse(
  * @property cardId Unique Tangem card ID number
  * @property challenge Random challenge generated by application
  */
-class CheckWalletCommand(
-        private val cardId: String,
-        private val challenge: ByteArray
-) : CommandSerializer<CheckWalletResponse>() {
+class CheckWalletCommand : CommandSerializer<CheckWalletResponse>() {
+
+    val challenge = CryptoUtils.generateRandomBytes(16)
 
     override fun serialize(cardEnvironment: CardEnvironment): CommandApdu {
-        val tlvData = listOf(
-                Tlv(TlvTag.Pin, cardEnvironment.pin1.calculateSha256()),
-                Tlv(TlvTag.CardId, cardId.hexToBytes()),
-                Tlv(TlvTag.Challenge, challenge)
-        )
-        return CommandApdu(Instruction.CheckWallet, tlvData)
+        val tlvBuilder = TlvBuilder()
+        tlvBuilder.append(TlvTag.Pin, cardEnvironment.pin1)
+        tlvBuilder.append(TlvTag.CardId, cardEnvironment.cardId)
+        tlvBuilder.append(TlvTag.Challenge, challenge)
+        return CommandApdu(Instruction.CheckWallet, tlvBuilder.serialize())
     }
 
     override fun deserialize(cardEnvironment: CardEnvironment, responseApdu: ResponseApdu): CheckWalletResponse? {
diff --git a/tangem-core/src/main/java/com/tangem/commands/CommandSerializer.kt b/tangem-core/src/main/java/com/tangem/commands/CommandSerializer.kt
index aad7f01b1b..92ee3d0d90 100644
--- a/tangem-core/src/main/java/com/tangem/commands/CommandSerializer.kt
+++ b/tangem-core/src/main/java/com/tangem/commands/CommandSerializer.kt
@@ -1,6 +1,6 @@
 package com.tangem.commands
 
-import com.tangem.CardEnvironment
+import com.tangem.common.CardEnvironment
 import com.tangem.common.apdu.CommandApdu
 import com.tangem.common.apdu.ResponseApdu
 import com.tangem.common.extensions.toInt
diff --git a/tangem-core/src/main/java/com/tangem/commands/CreateWalletCommand.kt b/tangem-core/src/main/java/com/tangem/commands/CreateWalletCommand.kt
index 833795cbbf..0c142ee296 100644
--- a/tangem-core/src/main/java/com/tangem/commands/CreateWalletCommand.kt
+++ b/tangem-core/src/main/java/com/tangem/commands/CreateWalletCommand.kt
@@ -1,12 +1,13 @@
 package com.tangem.commands
 
-import com.tangem.CardEnvironment
+import com.tangem.common.CardEnvironment
 import com.tangem.common.apdu.CommandApdu
 import com.tangem.common.apdu.Instruction
 import com.tangem.common.apdu.ResponseApdu
 import com.tangem.common.extensions.calculateSha256
 import com.tangem.common.extensions.hexToBytes
 import com.tangem.common.tlv.Tlv
+import com.tangem.common.tlv.TlvBuilder
 import com.tangem.common.tlv.TlvMapper
 import com.tangem.common.tlv.TlvTag
 import com.tangem.tasks.TaskError
@@ -37,21 +38,15 @@ class CreateWalletResponse(
  *
  * @property cardId CID, Unique Tangem card ID number.
  */
-class CreateWalletCommand(
-        private val cardId: String
-) : CommandSerializer<CreateWalletResponse>() {
+class CreateWalletCommand : CommandSerializer<CreateWalletResponse>() {
 
     override fun serialize(cardEnvironment: CardEnvironment): CommandApdu {
-        val tlvData = mutableListOf(
-                Tlv(TlvTag.Pin, cardEnvironment.pin1.calculateSha256()),
-                Tlv(TlvTag.CardId, cardId.hexToBytes()),
-                Tlv(TlvTag.Pin2, cardEnvironment.pin2.calculateSha256())
-        )
-        if (cardEnvironment.cvc != null) {
-            tlvData.add(Tlv(TlvTag.Cvc, cardEnvironment.cvc))
-        }
-
-        return CommandApdu(Instruction.CreateWallet, tlvData)
+        val tlvBuilder = TlvBuilder()
+        tlvBuilder.append(TlvTag.Pin, cardEnvironment.pin1)
+        tlvBuilder.append(TlvTag.CardId, cardEnvironment.cardId)
+        tlvBuilder.append(TlvTag.Pin2, cardEnvironment.pin2)
+        tlvBuilder.append(TlvTag.Cvc, cardEnvironment.cvc)
+        return CommandApdu(Instruction.CreateWallet, tlvBuilder.serialize())
     }
 
     override fun deserialize(cardEnvironment: CardEnvironment, responseApdu: ResponseApdu): CreateWalletResponse? {
diff --git a/tangem-core/src/main/java/com/tangem/commands/PurgeWalletCommand.kt b/tangem-core/src/main/java/com/tangem/commands/PurgeWalletCommand.kt
index f8c3feaf7f..cef8aca229 100644
--- a/tangem-core/src/main/java/com/tangem/commands/PurgeWalletCommand.kt
+++ b/tangem-core/src/main/java/com/tangem/commands/PurgeWalletCommand.kt
@@ -1,12 +1,13 @@
 package com.tangem.commands
 
-import com.tangem.CardEnvironment
+import com.tangem.common.CardEnvironment
 import com.tangem.common.apdu.CommandApdu
 import com.tangem.common.apdu.Instruction
 import com.tangem.common.apdu.ResponseApdu
 import com.tangem.common.extensions.calculateSha256
 import com.tangem.common.extensions.hexToBytes
 import com.tangem.common.tlv.Tlv
+import com.tangem.common.tlv.TlvBuilder
 import com.tangem.common.tlv.TlvMapper
 import com.tangem.common.tlv.TlvTag
 import com.tangem.tasks.TaskError
@@ -23,23 +24,20 @@ class PurgeWalletResponse(
 ) : CommandResponse
 
 /**
-* This command deletes all wallet data. If Is_Reusable flag is enabled during personalization,
+ * This command deletes all wallet data. If Is_Reusable flag is enabled during personalization,
 
  * If Is_Reusable flag is disabled, the card switches to ‘Purged’ state.
  * ‘Purged’ state is final, it makes the card useless.
  * @property cardId CID, Unique Tangem card ID number.
  */
-class PurgeWalletCommand(
-        private val cardId: String
-) : CommandSerializer<PurgeWalletResponse>() {
+class PurgeWalletCommand : CommandSerializer<PurgeWalletResponse>() {
 
     override fun serialize(cardEnvironment: CardEnvironment): CommandApdu {
-        val tlvData = mutableListOf(
-                Tlv(TlvTag.Pin, cardEnvironment.pin1.calculateSha256()),
-                Tlv(TlvTag.CardId, cardId.hexToBytes()),
-                Tlv(TlvTag.Pin2, cardEnvironment.pin2.calculateSha256())
-        )
-        return CommandApdu(Instruction.PurgeWallet, tlvData)
+        val tlvBuilder = TlvBuilder()
+        tlvBuilder.append(TlvTag.Pin, cardEnvironment.pin1)
+        tlvBuilder.append(TlvTag.CardId, cardEnvironment.cardId)
+        tlvBuilder.append(TlvTag.Pin2, cardEnvironment.pin2)
+        return CommandApdu(Instruction.PurgeWallet, tlvBuilder.serialize())
     }
 
     override fun deserialize(cardEnvironment: CardEnvironment, responseApdu: ResponseApdu): PurgeWalletResponse? {
diff --git a/tangem-core/src/main/java/com/tangem/commands/ReadCommand.kt b/tangem-core/src/main/java/com/tangem/commands/ReadCommand.kt
index d12548c92f..e6e2558685 100644
--- a/tangem-core/src/main/java/com/tangem/commands/ReadCommand.kt
+++ b/tangem-core/src/main/java/com/tangem/commands/ReadCommand.kt
@@ -1,11 +1,12 @@
 package com.tangem.commands
 
-import com.tangem.CardEnvironment
+import com.tangem.common.CardEnvironment
 import com.tangem.common.apdu.CommandApdu
 import com.tangem.common.apdu.Instruction
 import com.tangem.common.apdu.ResponseApdu
 import com.tangem.common.extensions.calculateSha256
 import com.tangem.common.tlv.Tlv
+import com.tangem.common.tlv.TlvBuilder
 import com.tangem.common.tlv.TlvMapper
 import com.tangem.common.tlv.TlvTag
 import com.tangem.tasks.TaskError
@@ -182,7 +183,7 @@ class Card(
         /**
          * Current status of the card.
          */
-        val status: CardStatus,
+        val status: CardStatus?,
 
         /**
          * Version of Tangem COS.
@@ -296,19 +297,16 @@ class Card(
 class ReadCommand : CommandSerializer<Card>() {
 
     override fun serialize(cardEnvironment: CardEnvironment): CommandApdu {
+        val tlvBuilder = TlvBuilder()
         /**
          *  [CardEnvironment] stores the pin1 value. If no pin1 value was set, it will contain
          *  default value of ‘000000’.
          *  In order to obtain card’s data, [ReadCommand] should use the correct pin 1 value.
          *  The card will not respond if wrong pin 1 has been submitted.
          */
-        val tlvData = mutableListOf(Tlv(TlvTag.Pin, cardEnvironment.pin1.calculateSha256()))
-
-        cardEnvironment.terminalKeys?.let { terminalKeys ->
-            Tlv(TlvTag.TerminalPublicKey, terminalKeys.publicKey)
-        }
-
-        return CommandApdu(Instruction.Read, tlvData)
+        tlvBuilder.append(TlvTag.Pin, cardEnvironment.pin1)
+        tlvBuilder.append(TlvTag.TerminalPublicKey, cardEnvironment.terminalKeys?.publicKey)
+        return CommandApdu(Instruction.Read, tlvBuilder.serialize())
     }
 
     override fun deserialize(cardEnvironment: CardEnvironment, responseApdu: ResponseApdu): Card? {
@@ -318,9 +316,9 @@ class ReadCommand : CommandSerializer<Card>() {
             val tlvMapper = TlvMapper(tlvData)
 
             Card(
-                    cardId = tlvMapper.map(TlvTag.CardId),
-                    manufacturerName = tlvMapper.map(TlvTag.ManufactureId),
-                    status = tlvMapper.map(TlvTag.Status),
+                    cardId = tlvMapper.mapOptional(TlvTag.CardId) ?: "",
+                    manufacturerName = tlvMapper.mapOptional(TlvTag.ManufactureId) ?: "",
+                    status = tlvMapper.mapOptional(TlvTag.Status),
 
                     firmwareVersion = tlvMapper.mapOptional(TlvTag.Firmware),
                     cardPublicKey = tlvMapper.mapOptional(TlvTag.CardPublicKey),
@@ -349,7 +347,7 @@ class ReadCommand : CommandSerializer<Card>() {
 
     private fun deserializeCardData(tlvData: List<Tlv>): CardData? {
         val cardDataTlvs = tlvData.find { it.tag == TlvTag.CardData }?.let {
-            Tlv.tlvListFromBytes(it.value)
+            Tlv.deserialize(it.value)
         }
         if (cardDataTlvs.isNullOrEmpty()) return null
 
diff --git a/tangem-core/src/main/java/com/tangem/commands/ReadIssuerDataCommand.kt b/tangem-core/src/main/java/com/tangem/commands/ReadIssuerDataCommand.kt
index 3772d178c8..c681f5fed9 100644
--- a/tangem-core/src/main/java/com/tangem/commands/ReadIssuerDataCommand.kt
+++ b/tangem-core/src/main/java/com/tangem/commands/ReadIssuerDataCommand.kt
@@ -1,12 +1,13 @@
 package com.tangem.commands
 
-import com.tangem.CardEnvironment
+import com.tangem.commands.common.DefaultIssuerDataVerifier
+import com.tangem.commands.common.IssuerDataMode
+import com.tangem.commands.common.IssuerDataVerifier
+import com.tangem.common.CardEnvironment
 import com.tangem.common.apdu.CommandApdu
 import com.tangem.common.apdu.Instruction
 import com.tangem.common.apdu.ResponseApdu
-import com.tangem.common.extensions.calculateSha256
-import com.tangem.common.extensions.hexToBytes
-import com.tangem.common.tlv.Tlv
+import com.tangem.common.tlv.TlvBuilder
 import com.tangem.common.tlv.TlvMapper
 import com.tangem.common.tlv.TlvTag
 import com.tangem.tasks.TaskError
@@ -50,15 +51,16 @@ class ReadIssuerDataResponse(
  * @property cardId CID, Unique Tangem card ID number.
  */
 class ReadIssuerDataCommand(
-        private val cardId: String
-) : CommandSerializer<ReadIssuerDataResponse>() {
+        verifier: IssuerDataVerifier = DefaultIssuerDataVerifier()
+) : CommandSerializer<ReadIssuerDataResponse>(),
+        IssuerDataVerifier by verifier {
 
     override fun serialize(cardEnvironment: CardEnvironment): CommandApdu {
-        val tlvData = listOf(
-                Tlv(TlvTag.Pin, cardEnvironment.pin1.calculateSha256()),
-                Tlv(TlvTag.CardId, cardId.hexToBytes())
-        )
-        return CommandApdu(Instruction.ReadIssuerData, tlvData)
+        val tlvBuilder = TlvBuilder()
+        tlvBuilder.append(TlvTag.Pin, cardEnvironment.pin1)
+        tlvBuilder.append(TlvTag.CardId, cardEnvironment.cardId)
+        tlvBuilder.append(TlvTag.Mode, IssuerDataMode.ReadData)
+        return CommandApdu(Instruction.ReadIssuerData, tlvBuilder.serialize())
     }
 
     override fun deserialize(cardEnvironment: CardEnvironment, responseApdu: ResponseApdu): ReadIssuerDataResponse? {
diff --git a/tangem-core/src/main/java/com/tangem/commands/ReadIssuerExtraDataCommand.kt b/tangem-core/src/main/java/com/tangem/commands/ReadIssuerExtraDataCommand.kt
new file mode 100644
index 0000000000..4e3f757395
--- /dev/null
+++ b/tangem-core/src/main/java/com/tangem/commands/ReadIssuerExtraDataCommand.kt
@@ -0,0 +1,97 @@
+package com.tangem.commands
+
+import com.tangem.commands.common.DefaultIssuerDataVerifier
+import com.tangem.commands.common.IssuerDataMode
+import com.tangem.commands.common.IssuerDataVerifier
+import com.tangem.common.CardEnvironment
+import com.tangem.common.apdu.CommandApdu
+import com.tangem.common.apdu.Instruction
+import com.tangem.common.apdu.ResponseApdu
+import com.tangem.common.tlv.TlvBuilder
+import com.tangem.common.tlv.TlvMapper
+import com.tangem.common.tlv.TlvTag
+import com.tangem.tasks.TaskError
+
+class ReadIssuerExtraDataResponse(
+
+        /**
+         * CID, Unique Tangem card ID number.
+         */
+        val cardId: String,
+
+        /**
+         * Size of all Issuer_Extra_Data field.
+         */
+        val size: Int?,
+
+        /**
+         * Data defined by issuer.
+         */
+        val issuerData: ByteArray,
+
+        /**
+         * Issuer’s signature of [issuerData] with Issuer Data Private Key (which is kept on card).
+         * Issuer’s signature of SHA256-hashed [cardId] concatenated with [issuerData]:
+         * SHA256([cardId] | [issuerData]).
+         * When flag [SettingsMask.protectIssuerDataAgainstReplay] set in [SettingsMask] then signature of
+         * SHA256-hashed CID Issuer_Data concatenated with and [issuerDataCounter]:
+         * SHA256([cardId] | [issuerData] | [issuerDataCounter]).
+         */
+        val issuerDataSignature: ByteArray?,
+
+        /**
+         * An optional counter that protect issuer data against replay attack.
+         * When flag [SettingsMask.protectIssuerDataAgainstReplay] set in [SettingsMask]
+         * then this value is mandatory and must increase on each execution of [WriteIssuerDataCommand].
+         */
+        val issuerDataCounter: Int?
+) : CommandResponse
+
+
+/**
+ * This command retrieves Issuer Extra Data field and its issuer’s signature.
+ * Issuer Extra Data is never changed or parsed from within the Tangem COS. The issuer defines purpose of use,
+ * format and payload of Issuer Data. . For example, this field may contain photo or
+ * biometric information for ID card product. Because of the large size of Issuer_Extra_Data,
+ * a series of these commands have to be executed to read the entire Issuer_Extra_Data.
+ */
+class ReadIssuerExtraDataCommand(
+        verifier: IssuerDataVerifier = DefaultIssuerDataVerifier()
+) : CommandSerializer<ReadIssuerExtraDataResponse>(), IssuerDataVerifier by verifier {
+
+    var offset: Int = 0
+
+    override fun serialize(cardEnvironment: CardEnvironment): CommandApdu {
+        val tlvBuilder = TlvBuilder()
+        tlvBuilder.append(TlvTag.Pin, cardEnvironment.pin1)
+        tlvBuilder.append(TlvTag.CardId, cardEnvironment.cardId)
+        tlvBuilder.append(TlvTag.Mode, IssuerDataMode.ReadExtraData)
+        tlvBuilder.append(TlvTag.Offset, offset)
+        return CommandApdu(Instruction.ReadIssuerData, tlvBuilder.serialize())
+    }
+
+    override fun deserialize(cardEnvironment: CardEnvironment, responseApdu: ResponseApdu): ReadIssuerExtraDataResponse? {
+        val tlvData = responseApdu.getTlvData() ?: return null
+
+        return try {
+            val mapper = TlvMapper(tlvData)
+            ReadIssuerExtraDataResponse(
+                    cardId = mapper.map(TlvTag.CardId),
+                    size = mapper.mapOptional(TlvTag.Size),
+                    issuerData = mapper.mapOptional(TlvTag.IssuerData) ?: byteArrayOf(),
+                    issuerDataSignature = mapper.mapOptional(TlvTag.IssuerDataSignature),
+                    issuerDataCounter = mapper.mapOptional(TlvTag.IssuerDataCounter)
+            )
+        } catch (exception: Exception) {
+            throw TaskError.SerializeCommandError()
+        }
+    }
+
+    companion object {
+        /**
+         * This mode value specifies that this command retrieves Issuer EXTRA data from the card
+         * (with value 0 the command will get instead simple Issuer Data from the card).
+         */
+        const val EXTRA_DATA_MODE = 1
+    }
+}
\ No newline at end of file
diff --git a/tangem-core/src/main/java/com/tangem/commands/ReadUserDataCommand.kt b/tangem-core/src/main/java/com/tangem/commands/ReadUserDataCommand.kt
new file mode 100644
index 0000000000..3628d9cad7
--- /dev/null
+++ b/tangem-core/src/main/java/com/tangem/commands/ReadUserDataCommand.kt
@@ -0,0 +1,79 @@
+package com.tangem.commands
+
+import com.tangem.common.CardEnvironment
+import com.tangem.common.apdu.CommandApdu
+import com.tangem.common.apdu.Instruction
+import com.tangem.common.apdu.ResponseApdu
+import com.tangem.common.tlv.TlvBuilder
+import com.tangem.common.tlv.TlvMapper
+import com.tangem.common.tlv.TlvTag
+import com.tangem.tasks.TaskError
+
+/**
+[REDACTED_AUTHOR]
+ */
+class ReadUserDataResponse(
+    /**
+     * CID, Unique Tangem card ID number.
+     */
+    val cardId: String,
+
+    /**
+     * Data defined by user's App.
+     */
+    val userData: ByteArray,
+
+    /**
+     * Data defined by user's App (confirmed by PIN2).
+     */
+    val userProtectedData: ByteArray,
+
+    /**
+     * Counter initialized by user's App and increased on every signing of new transaction
+     */
+    val userCounter: Int,
+
+    /**
+     * Counter initialized by user's App (confirmed by PIN2) and increased on every signing of new transaction
+     */
+    val userProtectedCounter: Int
+
+): CommandResponse
+
+/**
+ * This command returns two up to 512-byte User_Data, User_Protected_Data and two counters User_Counter and
+ * User_Protected_Counter fields.
+ * User_Data and User_ProtectedData are never changed or parsed by the executable code the Tangem COS.
+ * The App defines purpose of use, format and it's payload. For example, this field may contain cashed information
+ * from blockchain to accelerate preparing new transaction.
+ * User_Counter and User_ProtectedCounter are counters, that initial values can be set by App and increased on every signing
+ * of new transaction (on SIGN command that calculate new signatures). The App defines purpose of use.
+ * For example, this fields may contain blockchain nonce value.
+ */
+class ReadUserDataCommand: CommandSerializer<ReadUserDataResponse>() {
+
+  override fun serialize(cardEnvironment: CardEnvironment): CommandApdu {
+    val builder = TlvBuilder()
+    builder.append(TlvTag.CardId, cardEnvironment.cardId)
+    builder.append(TlvTag.Pin, cardEnvironment.pin1)
+
+    return CommandApdu(Instruction.ReadUserData, builder.serialize())
+  }
+
+  override fun deserialize(cardEnvironment: CardEnvironment, responseApdu: ResponseApdu): ReadUserDataResponse? {
+    val tlvData = responseApdu.getTlvData() ?: return null
+
+    return try {
+      val mapper = TlvMapper(tlvData)
+      ReadUserDataResponse(
+          cardId = mapper.map(TlvTag.CardId),
+          userData = mapper.map(TlvTag.UserData),
+          userProtectedData = mapper.map(TlvTag.UserProtectedData),
+          userCounter = mapper.map(TlvTag.UserCounter),
+          userProtectedCounter = mapper.map(TlvTag.UserProtectedCounter)
+      )
+    } catch (exception: Exception) {
+      throw TaskError.SerializeCommandError()
+    }
+  }
+}
\ No newline at end of file
diff --git a/tangem-core/src/main/java/com/tangem/commands/SignCommand.kt b/tangem-core/src/main/java/com/tangem/commands/SignCommand.kt
index a81a179f49..d76722e96c 100644
--- a/tangem-core/src/main/java/com/tangem/commands/SignCommand.kt
+++ b/tangem-core/src/main/java/com/tangem/commands/SignCommand.kt
@@ -1,12 +1,13 @@
 package com.tangem.commands
 
-import com.tangem.CardEnvironment
+import com.tangem.common.CardEnvironment
 import com.tangem.common.apdu.CommandApdu
 import com.tangem.common.apdu.Instruction
 import com.tangem.common.apdu.ResponseApdu
 import com.tangem.common.extensions.calculateSha256
 import com.tangem.common.extensions.hexToBytes
 import com.tangem.common.tlv.Tlv
+import com.tangem.common.tlv.TlvBuilder
 import com.tangem.common.tlv.TlvMapper
 import com.tangem.common.tlv.TlvTag
 import com.tangem.crypto.sign
@@ -32,7 +33,7 @@ class SignResponse(
  * @property hashes Array of transaction hashes.
  * @property cardId CID, Unique Tangem card ID number
  */
-class SignCommand(private val hashes: Array<ByteArray>, private val cardId: String)
+class SignCommand(private val hashes: Array<ByteArray>)
     : CommandSerializer<SignResponse>() {
 
     private val hashSizes = if (hashes.isNotEmpty()) hashes.first().size else 0
@@ -45,22 +46,21 @@ class SignCommand(private val hashes: Array<ByteArray>, private val cardId: Stri
 
     private fun checkForErrors() {
         if (hashes.isEmpty()) throw TaskError.EmptyHashes()
-        if (hashes.size > 10) throw TaskError.TooMuchHashes()
+        if (hashes.size > 10) throw TaskError.TooMuchHashesInOneTransaction()
         if (hashes.any { it.size != hashSizes }) throw TaskError.HashSizeMustBeEqual()
     }
 
     override fun serialize(cardEnvironment: CardEnvironment): CommandApdu {
-        val tlvData = mutableListOf(
-                Tlv(TlvTag.Pin, cardEnvironment.pin1.calculateSha256()),
-                Tlv(TlvTag.Pin2, cardEnvironment.pin2.calculateSha256()),
-                Tlv(TlvTag.CardId, cardId.hexToBytes()),
-                Tlv(TlvTag.TransactionOutHashSize, byteArrayOf(hashSizes.toByte())),
-                Tlv(TlvTag.TransactionOutHash, dataToSign)
-        )
+        val tlvBuilder = TlvBuilder()
+        tlvBuilder.append(TlvTag.Pin, cardEnvironment.pin1)
+        tlvBuilder.append(TlvTag.Pin2, cardEnvironment.pin2)
+        tlvBuilder.append(TlvTag.CardId, cardEnvironment.cardId)
+        tlvBuilder.append(TlvTag.TransactionOutHashSize, byteArrayOf(hashSizes.toByte()))
+        tlvBuilder.append(TlvTag.TransactionOutHash, dataToSign)
+        tlvBuilder.append(TlvTag.Cvc, cardEnvironment.cvc)
 
-        addTerminalSignature(cardEnvironment, tlvData)
-
-        return CommandApdu(Instruction.Sign, tlvData)
+        addTerminalSignature(cardEnvironment, tlvBuilder)
+        return CommandApdu(Instruction.Sign, tlvBuilder.serialize())
     }
 
     /**
@@ -70,11 +70,11 @@ class SignCommand(private val hashes: Array<ByteArray>, private val cardId: Stri
      * TerminalTransactionSignature parameter containing a correct signature of raw data to be signed made with TerminalPrivateKey
      * (this key should be generated and securily stored by the application).
      */
-    private fun addTerminalSignature(cardEnvironment: CardEnvironment, tlvData: MutableList<Tlv>) {
+    private fun addTerminalSignature(cardEnvironment: CardEnvironment, tlvBuilder: TlvBuilder) {
         cardEnvironment.terminalKeys?.let { terminalKeyPair ->
             val signedData = dataToSign.sign(terminalKeyPair.privateKey)
-            tlvData.add(Tlv(TlvTag.TerminalTransactionSignature, signedData))
-            tlvData.add(Tlv(TlvTag.TerminalPublicKey, terminalKeyPair.publicKey))
+            tlvBuilder.append(TlvTag.TerminalTransactionSignature, signedData)
+            tlvBuilder.append(TlvTag.TerminalPublicKey, terminalKeyPair.publicKey)
         }
     }
 
diff --git a/tangem-core/src/main/java/com/tangem/commands/WriteIssuerDataCommand.kt b/tangem-core/src/main/java/com/tangem/commands/WriteIssuerDataCommand.kt
index 7c8e27ef4f..2ca018f2a0 100644
--- a/tangem-core/src/main/java/com/tangem/commands/WriteIssuerDataCommand.kt
+++ b/tangem-core/src/main/java/com/tangem/commands/WriteIssuerDataCommand.kt
@@ -1,13 +1,13 @@
 package com.tangem.commands
 
-import com.tangem.CardEnvironment
+import com.tangem.commands.common.DefaultIssuerDataVerifier
+import com.tangem.commands.common.IssuerDataMode
+import com.tangem.commands.common.IssuerDataVerifier
+import com.tangem.common.CardEnvironment
 import com.tangem.common.apdu.CommandApdu
 import com.tangem.common.apdu.Instruction
 import com.tangem.common.apdu.ResponseApdu
-import com.tangem.common.extensions.calculateSha256
-import com.tangem.common.extensions.hexToBytes
-import com.tangem.common.extensions.toByteArray
-import com.tangem.common.tlv.Tlv
+import com.tangem.common.tlv.TlvBuilder
 import com.tangem.common.tlv.TlvMapper
 import com.tangem.common.tlv.TlvTag
 import com.tangem.tasks.TaskError
@@ -30,24 +30,22 @@ class WriteIssuerDataResponse(
  * @property issuerDataCounter An optional counter that protect issuer data against replay attack.
  */
 class WriteIssuerDataCommand(
-        private val cardId: String,
         private val issuerData: ByteArray,
         private val issuerDataSignature: ByteArray,
-        private val issuerDataCounter: Int? = null
-) : CommandSerializer<WriteIssuerDataResponse>() {
+        private val issuerDataCounter: Int? = null,
+        verifier: IssuerDataVerifier = DefaultIssuerDataVerifier()
+) : CommandSerializer<WriteIssuerDataResponse>(), IssuerDataVerifier by verifier {
 
     override fun serialize(cardEnvironment: CardEnvironment): CommandApdu {
-        val tlvData = mutableListOf(
-                Tlv(TlvTag.Pin, cardEnvironment.pin1.calculateSha256()),
-                Tlv(TlvTag.CardId, cardId.hexToBytes()),
-                Tlv(TlvTag.IssuerData, issuerData),
-                Tlv(TlvTag.IssuerDataSignature, issuerDataSignature)
-        )
-        if (issuerDataCounter != null) {
-            tlvData.add(Tlv(TlvTag.IssuerDataCounter, issuerDataCounter.toByteArray()))
-        }
+        val tlvBuilder = TlvBuilder()
+        tlvBuilder.append(TlvTag.Pin, cardEnvironment.pin1)
+        tlvBuilder.append(TlvTag.CardId, cardEnvironment.cardId)
+        tlvBuilder.append(TlvTag.Mode, IssuerDataMode.WriteData)
+        tlvBuilder.append(TlvTag.IssuerData, issuerData)
+        tlvBuilder.append(TlvTag.IssuerDataSignature, issuerDataSignature)
+        tlvBuilder.append(TlvTag.IssuerDataCounter, issuerDataCounter)
 
-        return CommandApdu(Instruction.WriteIssuerData, tlvData)
+        return CommandApdu(Instruction.WriteIssuerData, tlvBuilder.serialize())
     }
 
     override fun deserialize(cardEnvironment: CardEnvironment, responseApdu: ResponseApdu): WriteIssuerDataResponse? {
diff --git a/tangem-core/src/main/java/com/tangem/commands/WriteIssuerExtraDataCommand.kt b/tangem-core/src/main/java/com/tangem/commands/WriteIssuerExtraDataCommand.kt
new file mode 100644
index 0000000000..7a1b987cd5
--- /dev/null
+++ b/tangem-core/src/main/java/com/tangem/commands/WriteIssuerExtraDataCommand.kt
@@ -0,0 +1,90 @@
+package com.tangem.commands
+
+import com.tangem.commands.common.DefaultIssuerDataVerifier
+import com.tangem.commands.common.IssuerDataMode
+import com.tangem.commands.common.IssuerDataVerifier
+import com.tangem.common.CardEnvironment
+import com.tangem.common.apdu.CommandApdu
+import com.tangem.common.apdu.Instruction
+import com.tangem.common.apdu.ResponseApdu
+import com.tangem.common.tlv.TlvBuilder
+import com.tangem.common.tlv.TlvMapper
+import com.tangem.common.tlv.TlvTag
+import com.tangem.tasks.TaskError
+
+/**
+ * This command writes Issuer Extra Data field and its issuer’s signature.
+ * Issuer Extra Data is never changed or parsed from within the Tangem COS.
+ * The issuer defines purpose of use, format and payload of Issuer Data.
+ * For example, this field may contain a photo or biometric information for ID card products.
+ * Because of the large size of Issuer_Extra_Data, a series of these commands have to be executed
+ * to write entire Issuer_Extra_Data.
+ * @param issuerData Data provided by issuer.
+ * @param startingSignature Issuer’s signature with Issuer Data Private Key of [cardId],
+ * [issuerDataCounter] (if flags Protect_Issuer_Data_Against_Replay and
+ * Restrict_Overwrite_Issuer_Extra_Data are set in [SettingsMask]) and size of [issuerData].
+ * @param finalizingSignature Issuer’s signature with Issuer Data Private Key of [cardId],
+ * [issuerData] and [issuerDataCounter] (the latter one only if flags Protect_Issuer_Data_Against_Replay
+ * andRestrict_Overwrite_Issuer_Extra_Data are set in [SettingsMask]).
+ * @param issuerDataCounter An optional counter that protect issuer data against replay attack.
+ */
+class WriteIssuerExtraDataCommand(
+        private val issuerData: ByteArray,
+        private val startingSignature: ByteArray,
+        private val finalizingSignature: ByteArray,
+        private val issuerDataCounter: Int? = null,
+        verifier: IssuerDataVerifier = DefaultIssuerDataVerifier()
+) : CommandSerializer<WriteIssuerDataResponse>(), IssuerDataVerifier by verifier {
+
+    var mode: IssuerDataMode = IssuerDataMode.InitializeWritingExtraData
+    var offset: Int = 0
+
+    override fun serialize(cardEnvironment: CardEnvironment): CommandApdu {
+        val tlvBuilder = TlvBuilder()
+
+        tlvBuilder.append(TlvTag.Pin, cardEnvironment.pin1)
+        tlvBuilder.append(TlvTag.CardId, cardEnvironment.cardId)
+        tlvBuilder.append(TlvTag.Mode, mode)
+
+        when (mode) {
+            IssuerDataMode.InitializeWritingExtraData -> {
+                tlvBuilder.append(TlvTag.Size, issuerData.size)
+                tlvBuilder.append(TlvTag.IssuerDataSignature, startingSignature)
+                tlvBuilder.append(TlvTag.IssuerDataCounter, issuerDataCounter)
+            }
+            IssuerDataMode.WriteExtraData -> {
+                tlvBuilder.append(TlvTag.IssuerData, getDataToWrite())
+                tlvBuilder.append(TlvTag.Offset, offset)
+            }
+            IssuerDataMode.FinalizeExtraData -> {
+                tlvBuilder.append(TlvTag.IssuerDataSignature, finalizingSignature)
+            }
+        }
+        return CommandApdu(Instruction.WriteIssuerData, tlvBuilder.serialize())
+    }
+
+    private fun getDataToWrite(): ByteArray =
+            issuerData.copyOfRange(offset, offset + calculatePartSize())
+
+    private fun calculatePartSize(): Int {
+        val bytesLeft = issuerData.size - offset
+        return if (bytesLeft < SINGLE_WRITE_SIZE) bytesLeft else SINGLE_WRITE_SIZE
+    }
+
+    override fun deserialize(cardEnvironment: CardEnvironment, responseApdu: ResponseApdu): WriteIssuerDataResponse? {
+        val tlvData = responseApdu.getTlvData() ?: return null
+
+        return try {
+            val mapper = TlvMapper(tlvData)
+            WriteIssuerDataResponse(
+                    cardId = mapper.map(TlvTag.CardId)
+            )
+        } catch (exception: Exception) {
+            throw TaskError.SerializeCommandError()
+        }
+    }
+
+    companion object {
+        const val SINGLE_WRITE_SIZE = 1524
+    }
+}
\ No newline at end of file
diff --git a/tangem-core/src/main/java/com/tangem/commands/WriteUserDataCommand.kt b/tangem-core/src/main/java/com/tangem/commands/WriteUserDataCommand.kt
new file mode 100644
index 0000000000..d512c4ded7
--- /dev/null
+++ b/tangem-core/src/main/java/com/tangem/commands/WriteUserDataCommand.kt
@@ -0,0 +1,62 @@
+package com.tangem.commands
+
+import com.tangem.common.CardEnvironment
+import com.tangem.common.apdu.CommandApdu
+import com.tangem.common.apdu.Instruction
+import com.tangem.common.apdu.ResponseApdu
+import com.tangem.common.tlv.TlvBuilder
+import com.tangem.common.tlv.TlvMapper
+import com.tangem.common.tlv.TlvTag
+import com.tangem.tasks.TaskError
+
+/**
+[REDACTED_AUTHOR]
+ */
+
+class WriteUserDataResponse(
+    /**
+     * CID, Unique Tangem card ID number.
+     */
+    val cardId: String
+): CommandResponse
+
+/**
+ * This command write some of User_Data, User_ProtectedData, User_Counter and User_ProtectedCounter fields.
+ * User_Data and User_ProtectedData are never changed or parsed by the executable code the Tangem COS.
+ * The App defines purpose of use, format and it's payload. For example, this field may contain cashed information
+ * from blockchain to accelerate preparing new transaction.
+ * User_Counter and User_ProtectedCounter are counters, that initial values can be set by App and increased on every signing
+ * of new transaction (on SIGN command that calculate new signatures). The App defines purpose of use.
+ * For example, this fields may contain blockchain nonce value.
+ *
+ * Writing of User_Counter and User_Data protected only by PIN1.
+ * User_ProtectedCounter and User_ProtectedData additionaly need PIN2 to confirmation.
+ */
+class WriteUserDataCommand(private val userData: ByteArray? = null, private val userProtectedData: ByteArray? = null,
+    private val userCounter: Int? = null,
+    private val userProtectedCounter: Int? = null): CommandSerializer<WriteUserDataResponse>() {
+
+  override fun serialize(cardEnvironment: CardEnvironment): CommandApdu {
+    val builder = TlvBuilder()
+    builder.append(TlvTag.CardId, cardEnvironment.cardId)
+    builder.append(TlvTag.Pin, cardEnvironment.pin1)
+    builder.append(TlvTag.UserData, userData)
+    builder.append(TlvTag.UserCounter, userCounter)
+    builder.append(TlvTag.UserProtectedData, userProtectedData)
+    builder.append(TlvTag.UserProtectedCounter, userProtectedCounter)
+    if (userProtectedCounter != null || userProtectedData != null)
+      builder.append(TlvTag.Pin2, cardEnvironment.pin2)
+
+    return CommandApdu(Instruction.WriteUserData, builder.serialize())
+  }
+
+  override fun deserialize(cardEnvironment: CardEnvironment, responseApdu: ResponseApdu): WriteUserDataResponse? {
+    val tlvData = responseApdu.getTlvData() ?: return null
+
+    return try {
+      WriteUserDataResponse(TlvMapper(tlvData).map(TlvTag.CardId))
+    } catch (exception: Exception) {
+      throw TaskError.SerializeCommandError()
+    }
+  }
+}
\ No newline at end of file
diff --git a/tangem-core/src/main/java/com/tangem/commands/common/IssuerDataMode.kt b/tangem-core/src/main/java/com/tangem/commands/common/IssuerDataMode.kt
new file mode 100644
index 0000000000..2ebded1b6d
--- /dev/null
+++ b/tangem-core/src/main/java/com/tangem/commands/common/IssuerDataMode.kt
@@ -0,0 +1,44 @@
+package com.tangem.commands.common
+
+import com.tangem.commands.WriteIssuerExtraDataCommand
+
+/**
+ * This enum specifies modes for [WriteIssuerExtraDataCommand].
+ */
+enum class IssuerDataMode(val code: Byte) {
+
+
+    /**
+     * This mode is required to read issuer data from the card.
+     */
+    ReadData(0),
+
+    /**
+     * This mode is required to write issuer data to the card.
+     */
+    WriteData(0),
+    /**
+     * This mode is required to read issuer extra data from the card.
+     */
+    ReadExtraData(1),
+    /**
+     * This mode is required to initiate writing issuer extra data to the card.
+     */
+    InitializeWritingExtraData(1),
+    /**
+     * With this mode, the command writes part of issuer extra data
+     * (block of a size [WriteIssuerExtraDataCommand.SINGLE_WRITE_SIZE]) to the card.
+     */
+    WriteExtraData(2),
+    /**
+     * This mode is used after the issuer extra data was fully written to the card.
+     * Under this mode the command provides the issuer signature
+     * to confirm the validity of data that was written to card.
+     */
+    FinalizeExtraData(3);
+
+    companion object {
+        private val values = values()
+        fun byCode(code: Byte): IssuerDataMode? = values.find { it.code == code }
+    }
+}
\ No newline at end of file
diff --git a/tangem-core/src/main/java/com/tangem/commands/common/IssuerDataVerifier.kt b/tangem-core/src/main/java/com/tangem/commands/common/IssuerDataVerifier.kt
new file mode 100644
index 0000000000..03bf58d56e
--- /dev/null
+++ b/tangem-core/src/main/java/com/tangem/commands/common/IssuerDataVerifier.kt
@@ -0,0 +1,40 @@
+package com.tangem.commands.common
+
+import com.tangem.common.tlv.TlvEncoder
+import com.tangem.common.tlv.TlvTag
+import com.tangem.crypto.CryptoUtils
+import java.io.ByteArrayOutputStream
+
+interface IssuerDataVerifier {
+    fun verify(
+            issuerPublicKey: ByteArray, signature: ByteArray, issuerDataToVerify: IssuerDataToVerify
+    ): Boolean
+}
+
+class IssuerDataToVerify(
+        val cardId: String,
+        val issuerData: ByteArray?,
+        val issuerDataCounter: Int? = null,
+        val issuerExtraDataSize: Int? = null
+)
+
+class DefaultIssuerDataVerifier : IssuerDataVerifier {
+    override fun verify(
+            issuerPublicKey: ByteArray,
+            signature: ByteArray,
+            issuerDataToVerify: IssuerDataToVerify
+    ): Boolean {
+
+        val tlvEncoder = TlvEncoder()
+        val dataToVerify = ByteArrayOutputStream()
+        dataToVerify.write(tlvEncoder.encodeValue(TlvTag.CardId, issuerDataToVerify.cardId))
+        issuerDataToVerify.issuerData?.let { dataToVerify.write(it) }
+        issuerDataToVerify.issuerDataCounter?.let { counter ->
+            dataToVerify.write(tlvEncoder.encodeValue(TlvTag.IssuerDataCounter, counter))
+        }
+        issuerDataToVerify.issuerExtraDataSize?.let {
+            dataToVerify.write(tlvEncoder.encodeValue(TlvTag.Size, it))
+        }
+        return CryptoUtils.verify(issuerPublicKey, dataToVerify.toByteArray(), signature)
+    }
+}
\ No newline at end of file
diff --git a/tangem-core/src/main/java/com/tangem/CardEnvironment.kt b/tangem-core/src/main/java/com/tangem/common/CardEnvironment.kt
similarity index 96%
rename from tangem-core/src/main/java/com/tangem/CardEnvironment.kt
rename to tangem-core/src/main/java/com/tangem/common/CardEnvironment.kt
index 39e077006e..21728a8c44 100644
--- a/tangem-core/src/main/java/com/tangem/CardEnvironment.kt
+++ b/tangem-core/src/main/java/com/tangem/common/CardEnvironment.kt
@@ -1,4 +1,4 @@
-package com.tangem
+package com.tangem.common
 
 
 /**
diff --git a/tangem-core/src/main/java/com/tangem/common/TerminalKeysService.kt b/tangem-core/src/main/java/com/tangem/common/TerminalKeysService.kt
new file mode 100644
index 0000000000..d389c172b3
--- /dev/null
+++ b/tangem-core/src/main/java/com/tangem/common/TerminalKeysService.kt
@@ -0,0 +1,12 @@
+package com.tangem.common
+
+/**
+ * Interface for a service for managing Terminal keypair, used for Linked Terminal feature.
+ * Its implementation Needs to be provided to [com.tangem.CardManager]
+ * by calling [com.tangem.CardManager.setTerminalKeysService].
+ * Default implementation is provided in tangem-sdk module: [TerminalKeysStorage].
+ * Linked Terminal feature can be disabled manually by editing [com.tangem.Config].
+ */
+interface TerminalKeysService {
+    fun getKeys(): KeyPair
+}
\ No newline at end of file
diff --git a/tangem-core/src/main/java/com/tangem/common/apdu/CommandApdu.kt b/tangem-core/src/main/java/com/tangem/common/apdu/CommandApdu.kt
index f13c726438..450618ced5 100644
--- a/tangem-core/src/main/java/com/tangem/common/apdu/CommandApdu.kt
+++ b/tangem-core/src/main/java/com/tangem/common/apdu/CommandApdu.kt
@@ -1,8 +1,6 @@
 package com.tangem.common.apdu
 
-import com.tangem.EncryptionMode
-import com.tangem.common.tlv.Tlv
-import com.tangem.common.tlv.toBytes
+import com.tangem.common.EncryptionMode
 import java.io.ByteArrayOutputStream
 
 /**
@@ -15,7 +13,7 @@ import java.io.ByteArrayOutputStream
 class CommandApdu(
 
         private val ins: Int,
-        private val tlvList: List<Tlv>,
+        private val tlvs: ByteArray,
 
         private val cla: Byte = ISO_CLA,
         private val p1: Byte = 0x00,
@@ -28,12 +26,12 @@ class CommandApdu(
 
     constructor(
             instruction: Instruction,
-            tlvList: List<Tlv>,
+            tlvs: ByteArray,
             encryptionMode: EncryptionMode = EncryptionMode.NONE,
             encryptionKey: ByteArray? = null
     ) : this(
             instruction.code,
-            tlvList,
+            tlvs,
             encryptionMode = encryptionMode,
             encryptionKey = encryptionKey
     )
@@ -51,13 +49,7 @@ class CommandApdu(
 
     private fun toBytes(): ByteArray {
 
-        val data = if (tlvList.isNotEmpty()) {
-            tlvList.toBytes()
-        } else {
-            byteArrayOf()
-        }
-
-        val lc = data.size
+        val lc = tlvs.size
 
         val byteStream = ByteArrayOutputStream()
         byteStream.write(cla.toInt())
@@ -66,7 +58,7 @@ class CommandApdu(
         byteStream.write(p2.toInt())
         if (lc != 0) {
             writeLength(byteStream, lc)
-            byteStream.write(data)
+            byteStream.write(tlvs)
         }
         return byteStream.toByteArray()
     }
diff --git a/tangem-core/src/main/java/com/tangem/common/apdu/Instruction.kt b/tangem-core/src/main/java/com/tangem/common/apdu/Instruction.kt
index f0743aa0dc..a913813eb2 100644
--- a/tangem-core/src/main/java/com/tangem/common/apdu/Instruction.kt
+++ b/tangem-core/src/main/java/com/tangem/common/apdu/Instruction.kt
@@ -18,7 +18,9 @@ enum class Instruction(var code: Int) {
     Sign(0xFB),
     PurgeWallet(0xFC),
     Activate(0xFE),
-    OpenSession(0xFF);
+    OpenSession(0xFF),
+    WriteUserData(0xE0),
+    ReadUserData(0xE1);
 
 
     companion object {
diff --git a/tangem-core/src/main/java/com/tangem/common/apdu/ResponseApdu.kt b/tangem-core/src/main/java/com/tangem/common/apdu/ResponseApdu.kt
index c85f2ab9ba..e98c78874b 100644
--- a/tangem-core/src/main/java/com/tangem/common/apdu/ResponseApdu.kt
+++ b/tangem-core/src/main/java/com/tangem/common/apdu/ResponseApdu.kt
@@ -27,7 +27,7 @@ class ResponseApdu(private val data: ByteArray) {
     fun getTlvData(encryptionKey: ByteArray? = null): List<Tlv>? {
         return when {
             data.size <= 2 -> null
-            else -> Tlv.tlvListFromBytes(data.copyOf(data.size - 2))
+            else -> Tlv.deserialize(data.copyOf(data.size - 2))
         }
     }
 
diff --git a/tangem-core/src/main/java/com/tangem/common/extensions/ByteArray.kt b/tangem-core/src/main/java/com/tangem/common/extensions/ByteArray.kt
index 5c65596c9d..f7e416d700 100644
--- a/tangem-core/src/main/java/com/tangem/common/extensions/ByteArray.kt
+++ b/tangem-core/src/main/java/com/tangem/common/extensions/ByteArray.kt
@@ -1,5 +1,7 @@
 package com.tangem.common.extensions
 
+import org.spongycastle.crypto.digests.RIPEMD160Digest
+import org.spongycastle.jce.ECNamedCurveTable
 import java.nio.ByteBuffer
 import java.security.MessageDigest
 import java.util.*
@@ -34,3 +36,21 @@ fun ByteArray.toDate(): Date {
 fun ByteArray.calculateSha512(): ByteArray = MessageDigest.getInstance("SHA-512").digest(this)
 
 fun ByteArray.calculateSha256(): ByteArray = MessageDigest.getInstance("SHA-256").digest(this)
+
+fun ByteArray.calculateRipemd160(): ByteArray {
+    val digest = RIPEMD160Digest()
+    digest.update(this, 0, this.size)
+    val out = ByteArray(20)
+    digest.doFinal(out, 0)
+    return out
+}
+
+fun ByteArray.toCompressedPublicKey(): ByteArray {
+    return if (this.size == 65) {
+        val spec = ECNamedCurveTable.getParameterSpec("secp256k1")
+        val publicKeyPoint = spec.curve.decodePoint(this)
+        publicKeyPoint.getEncoded(true)
+    } else {
+        this
+    }
+}
\ No newline at end of file
diff --git a/tangem-core/src/main/java/com/tangem/common/extensions/IntExtensions.kt b/tangem-core/src/main/java/com/tangem/common/extensions/IntExtensions.kt
index 5565803830..0e8aa998da 100644
--- a/tangem-core/src/main/java/com/tangem/common/extensions/IntExtensions.kt
+++ b/tangem-core/src/main/java/com/tangem/common/extensions/IntExtensions.kt
@@ -2,9 +2,15 @@ package com.tangem.common.extensions
 
 import java.nio.ByteBuffer
 
-fun Int.toByteArray(): ByteArray {
-    val bufferSize = Int.SIZE_BYTES
-    val buffer = ByteBuffer.allocate(bufferSize)
-    buffer.putInt(this)
-    return buffer.array()
+fun Int.toByteArray(size: Int = Int.SIZE_BYTES): ByteArray {
+    if (size == Int.SIZE_BYTES) {
+        val buffer = ByteBuffer.allocate(size)
+        buffer.putInt(this)
+        return buffer.array()
+    } else if (size == Short.SIZE_BYTES){
+        return byteArrayOf(
+                (this ushr 8).toByte(),
+                this.toByte())
+    }
+    return byteArrayOf()
 }
\ No newline at end of file
diff --git a/tangem-core/src/main/java/com/tangem/common/tlv/Tlv.kt b/tangem-core/src/main/java/com/tangem/common/tlv/Tlv.kt
index f17ab7e3cb..544317c358 100644
--- a/tangem-core/src/main/java/com/tangem/common/tlv/Tlv.kt
+++ b/tangem-core/src/main/java/com/tangem/common/tlv/Tlv.kt
@@ -53,17 +53,17 @@ class Tlv {
         }
 
 
-        fun tlvListFromBytes(mData: ByteArray): List<Tlv>? {
+        fun deserialize(data: ByteArray, nfcV: Boolean = false): List<Tlv>? {
             val tlvList = mutableListOf<Tlv>()
-            val stream = ByteArrayInputStream(mData)
-            var tlv: Tlv? = null
+            val stream = ByteArrayInputStream(data)
+            var tlv: Tlv?
             do {
                 try {
-                    tlv = Tlv.tlvFromBytes(stream)
+                    tlv = tlvFromBytes(stream)
                     if (tlv != null) tlvList.add(tlv)
                 } catch (e: IOException) {
                     Log.e(this::class.java.simpleName,"TLVError: " + e.message)
-                    return null
+                    if (nfcV) break else return null
                 }
 
             } while (tlv != null)
@@ -73,10 +73,10 @@ class Tlv {
 
 }
 
-fun List<Tlv>.toBytes(): ByteArray =
-        this.map { it.toBytes() }.reduce { arr1, arr2 -> arr1 + arr2 }
+fun List<Tlv>.serialize(): ByteArray =
+        this.map { it.serialize() }.reduce { arr1, arr2 -> arr1 + arr2 }
 
-fun Tlv.toBytes(): ByteArray {
+fun Tlv.serialize(): ByteArray {
     val tag = byteArrayOf(this.tag.code.toByte())
     val length = getLengthInBytes(this.value.size)
     val value = if (this.value.isNotEmpty()) this.value else byteArrayOf(0x00)
diff --git a/tangem-core/src/main/java/com/tangem/common/tlv/TlvBuilder.kt b/tangem-core/src/main/java/com/tangem/common/tlv/TlvBuilder.kt
new file mode 100644
index 0000000000..6ec643d00a
--- /dev/null
+++ b/tangem-core/src/main/java/com/tangem/common/tlv/TlvBuilder.kt
@@ -0,0 +1,15 @@
+package com.tangem.common.tlv
+
+class TlvBuilder {
+    private val tlvs = mutableListOf<Tlv>()
+    private val encoder = TlvEncoder()
+
+    internal inline fun <reified T> append(tag: TlvTag, value: T?) {
+        if (value == null) return
+
+        tlvs.add(encoder.encode(tag, value))
+    }
+
+    fun serialize(): ByteArray = tlvs.serialize()
+
+}
\ No newline at end of file
diff --git a/tangem-core/src/main/java/com/tangem/common/tlv/TlvEncoder.kt b/tangem-core/src/main/java/com/tangem/common/tlv/TlvEncoder.kt
new file mode 100644
index 0000000000..e2dce7d743
--- /dev/null
+++ b/tangem-core/src/main/java/com/tangem/common/tlv/TlvEncoder.kt
@@ -0,0 +1,106 @@
+package com.tangem.common.tlv
+
+import com.tangem.Log
+import com.tangem.commands.*
+import com.tangem.commands.common.IssuerDataMode
+import com.tangem.common.extensions.calculateSha256
+import com.tangem.common.extensions.hexToBytes
+import com.tangem.common.extensions.toByteArray
+import com.tangem.tasks.TaskError
+import java.util.*
+
+/**
+ * Encodes information that is to be written on the card from parsed classes into [ByteArray]
+ * (according to the provided [TlvTag] and corresponding [TlvValueType])
+ * and then forms [Tlv] with the encoded values.
+ */
+class TlvEncoder {
+    /**
+
+     * @param value information that is to be encoded into [Tlv].
+     */
+    internal inline fun <reified T> encode(tag: TlvTag, value: T?): Tlv {
+        if (value != null) {
+            return Tlv(tag, encodeValue(tag, value))
+        } else {
+            Log.e(this::class.simpleName!!, "Encoding error. Value for tag $tag is null")
+            throw TaskError.SerializeCommandError()
+        }
+    }
+
+    internal inline fun <reified T> encodeValue(tag: TlvTag, value: T): ByteArray {
+        return when (tag.valueType()) {
+            TlvValueType.HexString -> {
+                typeCheck<T, String>(tag)
+                return if (tag == TlvTag.Pin || tag == TlvTag.Pin2) {
+                    (value as String).calculateSha256()
+                } else {
+                    (value as String).hexToBytes()
+                }
+            }
+            TlvValueType.Utf8String -> {
+                typeCheck<T, String>(tag)
+                (value as String).toByteArray()
+            }
+            TlvValueType.Uint16 -> {
+                typeCheck<T, Int>(tag)
+                (value as Int).toByteArray(2)
+            }
+            TlvValueType.Uint32 -> {
+                typeCheck<T, Int>(tag)
+                (value as Int).toByteArray()
+            }
+            TlvValueType.BoolValue -> {
+                typeCheck<T, Boolean>(tag)
+                Log.e(this::class.simpleName!!, "Unsupported operation: Boolean to ByteArray for tag $tag")
+                throw TaskError.ConvertError()
+            }
+            TlvValueType.ByteArray -> {
+                typeCheck<T, ByteArray>(tag)
+                value as ByteArray
+            }
+            TlvValueType.EllipticCurve -> {
+                typeCheck<T, EllipticCurve>(tag)
+                (value as EllipticCurve).curve.plus("\\0").toByteArray()
+            }
+            TlvValueType.DateTime -> {
+                typeCheck<T, Date>(tag)
+                val calendar = Calendar.getInstance().apply { time = (value as Date) }
+                val year = calendar.get(Calendar.YEAR)
+                val month = calendar.get(Calendar.MONTH) + 1
+                val day = calendar.get(Calendar.DAY_OF_MONTH)
+                return year.toByteArray() + month.toByteArray() + day.toByteArray()
+            }
+            TlvValueType.ProductMask -> {
+                typeCheck<T, ProductMask>(tag)
+                byteArrayOf(
+                        (value as ProductMask).code
+                )
+            }
+            TlvValueType.SettingsMask -> {
+                typeCheck<T, SettingsMask>(tag)
+                (value as SettingsMask).rawValue.toByteArray()
+            }
+            TlvValueType.CardStatus -> {
+                typeCheck<T, CardStatus>(tag)
+                (value as CardStatus).code.toByteArray()
+            }
+            TlvValueType.SigningMethod -> {
+                typeCheck<T, SigningMethod>(tag)
+                (value as SigningMethod).rawValue.toByteArray()
+            }
+            TlvValueType.IssuerDataMode -> {
+                typeCheck<T, IssuerDataMode>(tag)
+                byteArrayOf((value as IssuerDataMode).code)
+            }
+        }
+    }
+
+    private inline fun <reified T, reified ExpectedT> typeCheck(tag: TlvTag) {
+        if (T::class != ExpectedT::class){
+            Log.e(this::class.simpleName!!,
+                    "Mapping error. Type for tag: $tag must be ${tag.valueType()}. It is ${T::class}")
+            throw TaskError.WrongType()
+        }
+    }
+}
\ No newline at end of file
diff --git a/tangem-core/src/main/java/com/tangem/common/tlv/TlvMapper.kt b/tangem-core/src/main/java/com/tangem/common/tlv/TlvMapper.kt
index 6171dca7d9..ead8085ebe 100644
--- a/tangem-core/src/main/java/com/tangem/common/tlv/TlvMapper.kt
+++ b/tangem-core/src/main/java/com/tangem/common/tlv/TlvMapper.kt
@@ -1,19 +1,15 @@
 package com.tangem.common.tlv
 
+import com.tangem.Log
 import com.tangem.commands.*
+import com.tangem.commands.common.IssuerDataMode
 import com.tangem.common.extensions.toDate
 import com.tangem.common.extensions.toHexString
 import com.tangem.common.extensions.toInt
 import com.tangem.common.extensions.toUtf8
+import com.tangem.tasks.TaskError
 import java.util.*
 
-
-open class TlvMapperException(message: String?) : Exception(message)
-
-class MissingTagException(message: String? = null) : TlvMapperException(message)
-class WrongTypeException(message: String? = null) : TlvMapperException(message)
-class ConversionException(message: String? = null) : TlvMapperException(message)
-
 /**
  * Maps value fields in [Tlv] from raw [ByteArray] to concrete classes
  * according to their [TlvTag] and corresponding [TlvValueType].
@@ -33,98 +29,130 @@ class TlvMapper(val tlvList: List<Tlv>) {
     inline fun <reified T> mapOptional(tag: TlvTag): T? =
             try {
                 map<T>(tag)
-            } catch (exception: MissingTagException) {
+            } catch (exception: TaskError.MissingTag) {
                 null
             }
 
     /**
      * Finds [Tlv] by its [TlvTag].
-     * Throws [MissingTagException] if [Tlv] is not found,
+     * Throws [TaskError.MissingTag] if [Tlv] is not found,
      * otherwise converts [Tlv] value to [T].
      *
      * @param tag [TlvTag] of a [Tlv] which value is to be returned.
      *
      * @return [Tlv] value converted to a nullable type [T].
      *
-     * @throws [MissingTagException] if no [Tlv] is found by the Tag.
+     * @throws [TaskError.MissingTag] exception if no [Tlv] is found by the Tag.
      */
     inline fun <reified T> map(tag: TlvTag): T {
         val tlvValue: ByteArray = tlvList.find { it.tag == tag }?.value
                 ?: if (tag.valueType() == TlvValueType.BoolValue && T::class == Boolean::class) {
                     return false as T
                 } else {
-                    throw MissingTagException("Tag $tag not found")
+                    Log.e(this::class.simpleName!!, "Tag $tag not found")
+                    throw TaskError.MissingTag()
                 }
 
         return when (tag.valueType()) {
             TlvValueType.HexString -> {
-                if (T::class != String::class)
-                    throw WrongTypeException("Mapping error. Type for tag: $tag must be ${tag.valueType()}. It is ${T::class}")
+                typeCheck<T, String>(tag)
                 tlvValue.toHexString() as T
             }
             TlvValueType.Utf8String -> {
-                if (T::class != String::class)
-                    throw WrongTypeException("Mapping error. Type for tag: $tag must be ${tag.valueType()}. It is ${T::class}")
+                typeCheck<T, String>(tag)
                 tlvValue.toUtf8() as T
             }
-            TlvValueType.IntValue -> {
-                if (T::class != Integer::class)
-                    throw WrongTypeException("Mapping error. Type for tag: $tag must be ${tag.valueType()}. It is ${T::class}")
+            TlvValueType.Uint16, TlvValueType.Uint32 -> {
+                typeCheck<T, Int>(tag)
                 try {
                     tlvValue.toInt() as T
                 } catch (exception: IllegalArgumentException) {
-                    throw ConversionException(exception.message)
+                    Log.e(this::class.simpleName!!, exception.message ?: "")
+                    throw TaskError.ConvertError()
                 }
             }
             TlvValueType.BoolValue -> {
-                if (T::class != Boolean::class)
-                    throw WrongTypeException("Mapping error. Type for tag: $tag must be ${tag.valueType()}. It is ${T::class}")
+                typeCheck<T, Boolean>(tag)
                 true as T
             }
             TlvValueType.ByteArray -> {
-                if (T::class != ByteArray::class)
-                    throw WrongTypeException("Mapping error. Type for tag: $tag must be ${tag.valueType()}. It is ${T::class}")
+                typeCheck<T, ByteArray>(tag)
                 tlvValue as T
             }
             TlvValueType.EllipticCurve -> {
-                if (T::class != EllipticCurve::class)
-                    throw WrongTypeException("Mapping error. Type for tag: $tag must be ${tag.valueType()}. It is ${T::class}")
-                EllipticCurve.byName(tlvValue.toUtf8()) as? T
-                        ?: throw ConversionException("Unknown Elliptic Curve value: ${tlvValue.toUtf8()}")
+                typeCheck<T, EllipticCurve>(tag)
+                try {
+                    EllipticCurve.byName(tlvValue.toUtf8()) as T
+                } catch (exception: Exception) {
+                    logException(tag, tlvValue.toUtf8(), exception)
+                    throw TaskError.ConvertError()
+                }
+
+
             }
             TlvValueType.DateTime -> {
-                if (T::class != Date::class)
-                    throw WrongTypeException("Mapping error. Type for tag: $tag must be ${tag.valueType()}. It is ${T::class}")
+                typeCheck<T, Date>(tag)
                 try {
                     tlvValue.toDate() as T
                 } catch (exception: Exception) {
-                    throw ConversionException("Converting to date with the following exception: " + exception.message)
+                    logException(tag, tlvValue.toHexString(), exception)
+                    throw TaskError.ConvertError()
                 }
             }
             TlvValueType.ProductMask -> {
-                if (T::class != ProductMask::class)
-                    throw WrongTypeException("Mapping error. Type for tag: $tag must be ${tag.valueType()}. It is ${T::class}")
-                ProductMask.byCode(tlvValue.first()) as? T
-                        ?: throw ConversionException("Unknown Product Mask Code: ${tlvValue.first()}.")
+                typeCheck<T, ProductMask>(tag)
+                try {
+                    ProductMask.byCode(tlvValue.first()) as T
+                } catch (exception: Exception) {
+                    logException(tag, tlvValue.first().toString(), exception)
+                    throw TaskError.ConvertError()
+                }
             }
             TlvValueType.SettingsMask -> {
-                if (T::class != SettingsMask::class)
-                    throw WrongTypeException("Mapping error. Type for tag: $tag must be ${tag.valueType()}. It is ${T::class}")
+                typeCheck<T, SettingsMask>(tag)
                 SettingsMask(tlvValue.toInt()) as T
             }
             TlvValueType.CardStatus -> {
-                if (T::class != CardStatus::class)
-                    throw WrongTypeException("Mapping error. Type for tag: $tag must be ${tag.valueType()}. It is ${T::class}")
-                CardStatus.byCode(tlvValue.toInt()) as T
-                        ?: throw ConversionException("Unknown Card Status with code of: ${tlvValue.toInt()}")
+                typeCheck<T, CardStatus>(tag)
+                try {
+                    CardStatus.byCode(tlvValue.toInt()) as T
+                } catch (exception: Exception) {
+                    logException(tag, tlvValue.toInt().toString(), exception)
+                    throw TaskError.ConvertError()
+                }
             }
             TlvValueType.SigningMethod -> {
-                if (T::class != SigningMethod::class)
-                    throw WrongTypeException("Mapping error. Type for tag: $tag must be ${tag.valueType()}. It is ${T::class}")
-                SigningMethod(tlvValue.toInt()) as T
-                        ?: throw ConversionException("Unknown Signing Method with code of: ${tlvValue.toInt()}")
+                typeCheck<T, SigningMethod>(tag)
+                try {
+                    SigningMethod(tlvValue.toInt()) as T
+                } catch (exception: Exception) {
+                    logException(tag, tlvValue.toInt().toString(), exception)
+                    throw TaskError.ConvertError()
+                }
+            }
+            TlvValueType.IssuerDataMode -> {
+                typeCheck<T, IssuerDataMode>(tag)
+                try {
+                    IssuerDataMode.byCode(tlvValue.toInt().toByte()) as T
+                } catch (exception: Exception) {
+                    logException(tag, tlvValue.toInt().toString(), exception)
+                    throw TaskError.ConvertError()
+                }
             }
         }
     }
 
+    fun logException(tag: TlvTag, value: String, exception: Exception) {
+        Log.e(this::class.simpleName!!,
+                "Unknown ${tag.name} with value of: value, \n${exception.message}")
+    }
+
+    inline fun <reified T, reified ExpectedT> typeCheck(tag: TlvTag) {
+        if (T::class != ExpectedT::class) {
+            Log.e(this::class.simpleName!!,
+                    "Mapping error. Type for tag: $tag must be ${tag.valueType()}. It is ${T::class}")
+            throw TaskError.WrongType()
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/tangem-core/src/main/java/com/tangem/common/tlv/TlvTag.kt b/tangem-core/src/main/java/com/tangem/common/tlv/TlvTag.kt
index ca292d37f4..d37500e221 100644
--- a/tangem-core/src/main/java/com/tangem/common/tlv/TlvTag.kt
+++ b/tangem-core/src/main/java/com/tangem/common/tlv/TlvTag.kt
@@ -6,7 +6,8 @@ package com.tangem.common.tlv
 enum class TlvValueType {
     HexString,
     Utf8String,
-    IntValue,
+    Uint16,
+    Uint32,
     BoolValue,
     ByteArray,
     EllipticCurve,
@@ -14,7 +15,8 @@ enum class TlvValueType {
     ProductMask,
     SettingsMask,
     CardStatus,
-    SigningMethod
+    SigningMethod,
+    IssuerDataMode
 }
 
 /**
@@ -60,6 +62,10 @@ enum class TlvTag(val code: Int) {
     IssuerDataSignature(0x33),
     IssuerTransactionSignature(0x34),
     IssuerDataCounter(0x35),
+    Size(0x25),
+    Mode(0x23),
+    Offset(0x24),
+
 
     IsActivated(0x3A),
     ActivationSeed(0x3B),
@@ -88,7 +94,6 @@ enum class TlvTag(val code: Int) {
 
     ProductMask(0x8A),
     PaymentFlowVersion(0x54),
-    UserCounter(0x2C),
 
 
     TokenSymbol(0xA0),
@@ -101,25 +106,33 @@ enum class TlvTag(val code: Int) {
 
     TerminalIsLinked(0x58),
     TerminalPublicKey(0x5C),
-    TerminalTransactionSignature(0x57);
+    TerminalTransactionSignature(0x57),
+
+    UserData(0x2A),
+    UserProtectedData(0x2B),
+    UserCounter(0x2C),
+    UserProtectedCounter(0x2D);
 
     /**
      * @return [TlvValueType] associated with a [TlvTag]
      */
     fun valueType(): TlvValueType {
         return when (this) {
-            CardId, Pin, Batch -> TlvValueType.HexString
+            CardId, Pin, Pin2, Batch -> TlvValueType.HexString
             ManufactureId, Firmware, IssuerId, BlockchainId, TokenSymbol, TokenContractAddress ->
                 TlvValueType.Utf8String
             CurveId -> TlvValueType.EllipticCurve
             MaxSignatures, PauseBeforePin2, RemainingSignatures,
-            SignedHashes, Health, TokenDecimal, UserCounter, IssuerDataCounter -> TlvValueType.IntValue
+            SignedHashes, Health, TokenDecimal,
+            Offset, Size -> TlvValueType.Uint16
+            UserCounter, UserProtectedCounter, IssuerDataCounter -> TlvValueType.Uint32
             IsActivated, TerminalIsLinked -> TlvValueType.BoolValue
             ManufactureDateTime -> TlvValueType.DateTime
             ProductMask -> TlvValueType.ProductMask
             SettingsMask -> TlvValueType.SettingsMask
             Status -> TlvValueType.CardStatus
             SigningMethod -> TlvValueType.SigningMethod
+            Mode -> TlvValueType.IssuerDataMode
             else -> TlvValueType.ByteArray
         }
     }
diff --git a/tangem-core/src/main/java/com/tangem/tasks/ReadIssuerDataTask.kt b/tangem-core/src/main/java/com/tangem/tasks/ReadIssuerDataTask.kt
new file mode 100644
index 0000000000..d7c50dde31
--- /dev/null
+++ b/tangem-core/src/main/java/com/tangem/tasks/ReadIssuerDataTask.kt
@@ -0,0 +1,53 @@
+package com.tangem.tasks
+
+import com.tangem.commands.Card
+import com.tangem.commands.ReadIssuerDataCommand
+import com.tangem.commands.ReadIssuerDataResponse
+import com.tangem.commands.common.IssuerDataToVerify
+import com.tangem.common.CardEnvironment
+import com.tangem.common.CompletionResult
+
+class ReadIssuerDataTask(private val issuerPublicKey: ByteArray? = null) : Task<ReadIssuerDataResponse>() {
+
+    override fun onRun(
+            cardEnvironment: CardEnvironment,
+            currentCard: Card?,
+            callback: (result: TaskEvent<ReadIssuerDataResponse>) -> Unit) {
+
+        val command = ReadIssuerDataCommand()
+
+        sendCommand(command, cardEnvironment) { result ->
+            when (result) {
+                is CompletionResult.Success -> {
+                    val data = result.data
+                    if (data.issuerData.isEmpty()) {
+                        completeNfcSession()
+                        callback(TaskEvent.Event(result.data))
+                        callback(TaskEvent.Completion())
+                        return@sendCommand
+                    }
+                    val publicKey = issuerPublicKey ?: currentCard!!.issuerPublicKey!!
+                    val issuerDataToVerify = IssuerDataToVerify(
+                            cardEnvironment.cardId!!,
+                            data.issuerData,
+                            data.issuerDataCounter
+                    )
+                    if (command.verify(publicKey, data.issuerDataSignature, issuerDataToVerify)) {
+                        completeNfcSession()
+                        callback(TaskEvent.Event(result.data))
+                        callback(TaskEvent.Completion())
+                    } else {
+                        completeNfcSession(TaskError.VerificationFailed())
+                        callback(TaskEvent.Completion(TaskError.VerificationFailed()))
+                    }
+                }
+                is CompletionResult.Failure -> {
+                    if (result.error !is TaskError.UserCancelled) {
+                        completeNfcSession(result.error)
+                    }
+                    callback(TaskEvent.Completion(result.error))
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/tangem-core/src/main/java/com/tangem/tasks/ReadIssuerExtraDataTask.kt b/tangem-core/src/main/java/com/tangem/tasks/ReadIssuerExtraDataTask.kt
new file mode 100644
index 0000000000..4f1397b8db
--- /dev/null
+++ b/tangem-core/src/main/java/com/tangem/tasks/ReadIssuerExtraDataTask.kt
@@ -0,0 +1,100 @@
+package com.tangem.tasks
+
+import com.tangem.commands.Card
+import com.tangem.commands.ReadIssuerExtraDataCommand
+import com.tangem.commands.ReadIssuerExtraDataResponse
+import com.tangem.commands.WriteIssuerExtraDataCommand
+import com.tangem.commands.common.IssuerDataToVerify
+import com.tangem.common.CardEnvironment
+import com.tangem.common.CompletionResult
+import java.io.ByteArrayOutputStream
+
+/**
+ * This task performs [ReadIssuerExtraDataCommand] repeatedly until
+ * the issuer extra data is fully retrieved.
+ */
+internal class ReadIssuerExtraDataTask(
+        private val issuerPublicKey: ByteArray?) : Task<ReadIssuerExtraDataResponse>() {
+
+    private val issuerData = ByteArrayOutputStream()
+    private var issuerDataSize = 0
+    private lateinit var card: Card
+    private lateinit var cardEnvironment: CardEnvironment
+
+    override fun onRun(
+            cardEnvironment: CardEnvironment,
+            currentCard: Card?,
+            callback: (result: TaskEvent<ReadIssuerExtraDataResponse>) -> Unit
+    ) {
+        card = currentCard!!
+        this.cardEnvironment = cardEnvironment
+        val command = ReadIssuerExtraDataCommand()
+        readIssuerData(command, callback)
+    }
+
+    private fun readIssuerData(
+            command: ReadIssuerExtraDataCommand,
+            callback: (result: TaskEvent<ReadIssuerExtraDataResponse>) -> Unit) {
+
+        if (issuerDataSize != 0) {
+            delegate?.onDelay(
+                    issuerDataSize, command.offset, WriteIssuerExtraDataCommand.SINGLE_WRITE_SIZE
+            )
+        }
+
+        sendCommand(command, cardEnvironment) { result ->
+            when (result) {
+
+                is CompletionResult.Success -> {
+                    if (result.data.size != null) {
+                        if (result.data.size == 0) {
+                            completeNfcSession()
+                            callback(TaskEvent.Event(result.data))
+                            callback(TaskEvent.Completion())
+                            return@sendCommand
+                        }
+                        issuerDataSize = result.data.size
+                    }
+                    issuerData.write(result.data.issuerData)
+                    if (result.data.issuerDataSignature == null) {
+                        command.offset = issuerData.size()
+                        readIssuerData(command, callback)
+                    } else {
+                        completeTask(result.data, command, callback)
+                    }
+                }
+                is CompletionResult.Failure -> {
+                    if (result.error !is TaskError.UserCancelled) {
+                        completeNfcSession(result.error)
+                    }
+                    callback(TaskEvent.Completion(result.error))
+                }
+            }
+        }
+    }
+
+    private fun completeTask(data: ReadIssuerExtraDataResponse, command: ReadIssuerExtraDataCommand,
+                             callback: (result: TaskEvent<ReadIssuerExtraDataResponse>) -> Unit) {
+        val publicKey = issuerPublicKey ?: card.issuerPublicKey!!
+        val dataToVerify = IssuerDataToVerify(
+                cardEnvironment.cardId!!,
+                issuerData.toByteArray(),
+                data.issuerDataCounter
+        )
+        if (command.verify(publicKey, data.issuerDataSignature!!, dataToVerify)) {
+            completeNfcSession()
+            val finalResult = ReadIssuerExtraDataResponse(
+                    data.cardId,
+                    issuerDataSize,
+                    issuerData.toByteArray(),
+                    data.issuerDataSignature,
+                    data.issuerDataCounter
+            )
+            callback(TaskEvent.Event(finalResult))
+            callback(TaskEvent.Completion())
+        } else {
+            completeNfcSession(TaskError.VerificationFailed())
+            callback(TaskEvent.Completion(TaskError.VerificationFailed()))
+        }
+    }
+}
\ No newline at end of file
diff --git a/tangem-core/src/main/java/com/tangem/tasks/ScanTask.kt b/tangem-core/src/main/java/com/tangem/tasks/ScanTask.kt
index e80da5189f..90a8629be0 100644
--- a/tangem-core/src/main/java/com/tangem/tasks/ScanTask.kt
+++ b/tangem-core/src/main/java/com/tangem/tasks/ScanTask.kt
@@ -1,9 +1,7 @@
 package com.tangem.tasks
 
-import com.tangem.CardEnvironment
-import com.tangem.commands.Card
-import com.tangem.commands.CheckWalletCommand
-import com.tangem.commands.ReadCommand
+import com.tangem.commands.*
+import com.tangem.common.CardEnvironment
 import com.tangem.common.CompletionResult
 import com.tangem.crypto.CryptoUtils
 
@@ -31,64 +29,51 @@ sealed class ScanEvent {
 internal class ScanTask : Task<ScanEvent>() {
 
     override fun onRun(cardEnvironment: CardEnvironment,
+                       currentCard: Card?,
                        callback: (result: TaskEvent<ScanEvent>) -> Unit) {
 
-        val readCommand = ReadCommand()
-        sendCommand(readCommand, cardEnvironment) { readResult ->
+        if (currentCard != null) callback(TaskEvent.Event(ScanEvent.OnReadEvent(currentCard)))
 
-            when (readResult) {
+        if (currentCard == null) {
+            completeNfcSession(TaskError.MissingPreflightRead())
+            callback(TaskEvent.Completion(TaskError.MissingPreflightRead()))
 
-                is CompletionResult.Failure -> {
-                    if (readResult.error !is TaskError.UserCancelledError) {
-                        completeNfcSession(true, readResult.error)
-                    }
-                    callback(TaskEvent.Completion(readResult.error))
-                }
+        } else if (currentCard.cardData?.productMask == ProductMask.Tag) {
+            completeNfcSession()
+            callback(TaskEvent.Completion())
 
-                is CompletionResult.Success -> {
-                    val card = readResult.data
+        } else if (currentCard.status != CardStatus.Loaded) {
+            completeNfcSession()
+            callback(TaskEvent.Completion())
 
-                    callback(TaskEvent.Event(ScanEvent.OnReadEvent(card)))
+        } else if (currentCard.curve == null || currentCard.walletPublicKey == null) {
+            completeNfcSession(TaskError.CardError())
+            callback(TaskEvent.Completion(TaskError.CardError()))
 
-                    if (card.curve == null || card.walletPublicKey == null) {
-                        completeNfcSession(true)
-                        callback(TaskEvent.Completion(TaskError.CardError()))
-                        return@sendCommand
-                    }
+        } else {
 
-                    val challenge = CryptoUtils.generateRandomBytes(16)
-                    val checkWalletCommand = CheckWalletCommand(
-                            card.cardId,
-                            challenge)
+            val checkWalletCommand = CheckWalletCommand()
 
-                    sendCommand(checkWalletCommand, cardEnvironment) { result ->
-                        when (result) {
-                            is CompletionResult.Failure -> {
-                                if (result.error !is TaskError.UserCancelledError) {
-                                    completeNfcSession(true, result.error)
-                                }
-                                callback(TaskEvent.Completion(result.error))
-                            }
-
-                            is CompletionResult.Success -> {
-                                completeNfcSession()
-                                val checkWalletResponse = result.data
-                                val verified = CryptoUtils.verify(
-                                        card.walletPublicKey,
-                                        challenge + checkWalletResponse.salt,
-                                        checkWalletResponse.walletSignature,
-                                        card.curve)
-                                if (verified) {
-                                    callback(TaskEvent.Event(ScanEvent.OnVerifyEvent(true)))
-                                    callback(TaskEvent.Completion())
-                                } else {
-                                    callback(TaskEvent.Completion(TaskError.VefificationFailed()))
-                                }
-                            }
+            sendCommand(checkWalletCommand, cardEnvironment) { result ->
+                when (result) {
+                    is CompletionResult.Failure -> {
+                        if (result.error !is TaskError.UserCancelled) {
+                            completeNfcSession(result.error)
                         }
-
+                        callback(TaskEvent.Completion(result.error))
+                    }
+                    is CompletionResult.Success -> {
+                        completeNfcSession()
+                        val verified = result.data.verify(
+                                currentCard.curve,
+                                currentCard.walletPublicKey,
+                                checkWalletCommand.challenge
+                        )
+                        callback(TaskEvent.Event(ScanEvent.OnVerifyEvent(verified)))
+                        callback(TaskEvent.Completion())
                     }
                 }
+
             }
         }
     }
diff --git a/tangem-core/src/main/java/com/tangem/tasks/SingleCommandTask.kt b/tangem-core/src/main/java/com/tangem/tasks/SingleCommandTask.kt
index 34ed9b0a69..03efa615f8 100644
--- a/tangem-core/src/main/java/com/tangem/tasks/SingleCommandTask.kt
+++ b/tangem-core/src/main/java/com/tangem/tasks/SingleCommandTask.kt
@@ -1,6 +1,7 @@
 package com.tangem.tasks
 
-import com.tangem.CardEnvironment
+import com.tangem.commands.Card
+import com.tangem.common.CardEnvironment
 import com.tangem.commands.CommandResponse
 import com.tangem.commands.CommandSerializer
 import com.tangem.common.CompletionResult
@@ -14,8 +15,11 @@ class SingleCommandTask<Event : CommandResponse>(
         private val command: CommandSerializer<Event>
 ) : Task<Event>() {
 
-    override fun onRun(cardEnvironment: CardEnvironment,
-                       callback: (result: TaskEvent<Event>) -> Unit) {
+    override fun onRun(
+            cardEnvironment: CardEnvironment,
+            currentCard: Card?,
+            callback: (result: TaskEvent<Event>) -> Unit
+    ) {
         sendCommand(command, cardEnvironment) { result ->
             when (result) {
                 is CompletionResult.Success -> {
@@ -24,8 +28,8 @@ class SingleCommandTask<Event : CommandResponse>(
                     callback(TaskEvent.Completion())
                 }
                 is CompletionResult.Failure -> {
-                    if (result.error !is TaskError.UserCancelledError) {
-                        completeNfcSession(true, result.error)
+                    if (result.error !is TaskError.UserCancelled) {
+                        completeNfcSession(result.error)
                     }
                     callback(TaskEvent.Completion(result.error))
                 }
diff --git a/tangem-core/src/main/java/com/tangem/tasks/Task.kt b/tangem-core/src/main/java/com/tangem/tasks/Task.kt
index 3998586946..2e193ecc5e 100644
--- a/tangem-core/src/main/java/com/tangem/tasks/Task.kt
+++ b/tangem-core/src/main/java/com/tangem/tasks/Task.kt
@@ -1,11 +1,13 @@
 package com.tangem.tasks
 
-import com.tangem.CardEnvironment
 import com.tangem.CardManagerDelegate
 import com.tangem.CardReader
 import com.tangem.Log
+import com.tangem.commands.Card
 import com.tangem.commands.CommandResponse
 import com.tangem.commands.CommandSerializer
+import com.tangem.commands.ReadCommand
+import com.tangem.common.CardEnvironment
 import com.tangem.common.CompletionResult
 import com.tangem.common.apdu.CommandApdu
 import com.tangem.common.apdu.StatusWord
@@ -14,30 +16,44 @@ import com.tangem.common.apdu.StatusWord
  * An error class that represent typical errors that may occur when performing Tangem SDK tasks.
  * Errors are propagated back to the caller in callbacks.
  */
-sealed class TaskError(description: String? = null) : Exception(description) {
-    class UnknownStatus(sw: Int) : TaskError("Unknown StatusWord: $sw")
-    class MappingError : TaskError()
-    class GenericError(description: String? = null) : TaskError(description)
-    class UserCancelledError() : TaskError()
-    class Busy() : TaskError()
-    class TagLost() : TaskError()
+sealed class TaskError(val code: Int): Exception() {
 
-    class ErrorProcessingCommand : TaskError()
-    class InvalidState : TaskError()
-    class InsNotSupported : TaskError()
-    class InvalidParams : TaskError()
-    class NeedEncryption : TaskError()
-    class NeedPause : TaskError()
+    //Errors in serializing APDU
+    class SerializeCommandError: TaskError(1001)
+    class EncodingError: TaskError(1002)
+    class MissingTag: TaskError(1003)
+    class WrongType: TaskError(1004)
+    class ConvertError: TaskError(1005)
 
-    class VefificationFailed : TaskError()
-    class CardError : TaskError()
-    class ReaderError() : TaskError()
-    class SerializeCommandError() : TaskError()
+    //Card errors
+    class UnknownStatus: TaskError(2001)
+    class ErrorProcessingCommand: TaskError(2002)
+    class MissingPreflightRead: TaskError(2003)
+    class InvalidState: TaskError(2004)
+    class InsNotSupported: TaskError(2005)
+    class InvalidParams: TaskError(2006)
+    class NeedEncryption: TaskError(2007)
 
-    class CardIsMissing() : TaskError()
-    class EmptyHashes() : TaskError()
-    class TooMuchHashes() : TaskError()
-    class HashSizeMustBeEqual() : TaskError()
+    //Scan errors
+    class VerificationFailed: TaskError(3000)
+    class CardError: TaskError(3001)
+    class WrongCard: TaskError(3002)
+    class TooMuchHashesInOneTransaction: TaskError(3003)
+    class EmptyHashes: TaskError(3004)
+    class HashSizeMustBeEqual: TaskError(3005)
+
+    class Busy: TaskError(4000)
+    class UserCancelled: TaskError(4001)
+    class UnsupportedDevice: TaskError(4002)
+
+    //NFC error
+    class NfcReaderError: TaskError(5002)
+    class TagLost: TaskError(5003)
+
+    class UnknownError: TaskError(6000)
+
+    //Issuer Data Errors
+    class MissingCounter: TaskError(7001)
 }
 
 /**
@@ -67,6 +83,8 @@ abstract class Task<T> {
 
     var delegate: CardManagerDelegate? = null
     var reader: CardReader? = null
+    var performPreflightRead: Boolean = true
+    var securityDelayDuration: Int = 0
 
     /**
      * This method should be called to run the [Task] and perform all its operations.
@@ -76,21 +94,25 @@ abstract class Task<T> {
      */
     fun run(cardEnvironment: CardEnvironment,
             callback: (result: TaskEvent<T>) -> Unit) {
-        delegate?.onNfcSessionStarted()
+        delegate?.onNfcSessionStarted(cardEnvironment.cardId)
         reader?.openSession()
         Log.i(this::class.simpleName!!, "Nfc task is started")
-        onRun(cardEnvironment, callback)
+
+        if (performPreflightRead) {
+            runWithPreflightRead(cardEnvironment, callback)
+        } else {
+            onRun(cardEnvironment, null, callback)
+        }
     }
 
     /**
      * Should be called on [Task] completion, whether it was successful or with failure.
      *
-     * @param withError True when there is an error
      * @param taskError The error to be shown by [CardManagerDelegate]
      */
-    protected fun completeNfcSession(withError: Boolean = false, taskError: TaskError? = null) {
+    protected fun completeNfcSession(taskError: TaskError? = null) {
         reader?.closeSession()
-        if (withError) {
+        if (taskError != null) {
             delegate?.onError(taskError)
         } else {
             delegate?.onNfcSessionCompleted()
@@ -101,6 +123,7 @@ abstract class Task<T> {
      * In this method the individual Tasks' logic should be implemented.
      */
     protected abstract fun onRun(cardEnvironment: CardEnvironment,
+                                 currentCard: Card?,
                                  callback: (result: TaskEvent<T>) -> Unit)
 
     /**
@@ -140,7 +163,10 @@ abstract class Task<T> {
                             }
                         }
                         StatusWord.InvalidParams -> callback(CompletionResult.Failure(TaskError.InvalidParams()))
-                        StatusWord.Unknown -> callback(CompletionResult.Failure(TaskError.UnknownStatus(result.data.sw)))
+                        StatusWord.Unknown -> {
+                            Log.e(this::class.simpleName!!, "Unknown status error: ${result.data.sw}")
+                            callback(CompletionResult.Failure(TaskError.UnknownStatus()))
+                        }
                         StatusWord.ErrorProcessingCommand -> callback(CompletionResult.Failure(TaskError.ErrorProcessingCommand()))
                         StatusWord.InvalidState -> callback(CompletionResult.Failure(TaskError.InvalidState()))
 
@@ -149,22 +175,51 @@ abstract class Task<T> {
                         StatusWord.NeedPause -> {
                             // When NeedPause is returned from the card whenever security delay is triggered.
                             val remainingTime = command.deserializeSecurityDelay(responseApdu, cardEnvironment)
-                            if (remainingTime != null) delegate?.onSecurityDelay(remainingTime)
+                            if (remainingTime != null) delegate?.onSecurityDelay(remainingTime, securityDelayDuration)
                             Log.i(this::class.simpleName!!, "Nfc command ${command::class.simpleName!!} triggered security delay of $remainingTime milliseconds")
                             sendRequest(command, commandApdu, cardEnvironment, callback)
                         }
                     }
                 }
                 is CompletionResult.Failure ->
-                    if (result.error is TaskError.TagLost) {
+                    if (result.error == TaskError.TagLost()) {
                         delegate?.onTagLost()
-                    } else if (result.error is TaskError.UserCancelledError) {
-                        callback(CompletionResult.Failure(TaskError.UserCancelledError()))
+                    } else if (result.error is TaskError.UserCancelled) {
+                        callback(CompletionResult.Failure(TaskError.UserCancelled()))
                         reader?.closeSession()
                     }
             }
         }
     }
+
+    private fun runWithPreflightRead(
+            environment: CardEnvironment, callback: (result: TaskEvent<T>) -> Unit) {
+        sendCommand(ReadCommand(), environment) { readResult ->
+            when (readResult) {
+                is CompletionResult.Failure -> {
+                    completeNfcSession(readResult.error)
+                    callback(TaskEvent.Completion(readResult.error))
+                }
+                is CompletionResult.Success -> {
+
+                    val receivedCardId = readResult.data.cardId
+                    securityDelayDuration = readResult.data.pauseBeforePin2 ?: 0
+
+                    if (environment.cardId != null && environment.cardId != receivedCardId) {
+                        completeNfcSession(TaskError.WrongCard())
+                        callback(TaskEvent.Completion(TaskError.WrongCard()))
+                        return@sendCommand
+                    }
+
+                    val newEnvironment = environment.copy(cardId = receivedCardId)
+                    onRun(newEnvironment, readResult.data, callback)
+                }
+            }
+
+
+        }
+
+    }
 }
 
 
diff --git a/tangem-core/src/main/java/com/tangem/tasks/WriteIssuerDataTask.kt b/tangem-core/src/main/java/com/tangem/tasks/WriteIssuerDataTask.kt
new file mode 100644
index 0000000000..c8b3bcb083
--- /dev/null
+++ b/tangem-core/src/main/java/com/tangem/tasks/WriteIssuerDataTask.kt
@@ -0,0 +1,67 @@
+package com.tangem.tasks
+
+import com.tangem.commands.Card
+import com.tangem.commands.SettingsMask
+import com.tangem.commands.WriteIssuerDataCommand
+import com.tangem.commands.WriteIssuerDataResponse
+import com.tangem.commands.common.IssuerDataToVerify
+import com.tangem.common.CardEnvironment
+import com.tangem.common.CompletionResult
+
+class WriteIssuerDataTask(
+        private val issuerData: ByteArray,
+        private val issuerDataSignature: ByteArray,
+        private val issuerDataCounter: Int? = null,
+        private val issuerPublicKey: ByteArray? = null
+) : Task<WriteIssuerDataResponse>() {
+
+    private lateinit var card: Card
+
+    override fun onRun(
+            cardEnvironment: CardEnvironment,
+            currentCard: Card?,
+            callback: (result: TaskEvent<WriteIssuerDataResponse>) -> Unit) {
+
+        card = currentCard!!
+        val command = WriteIssuerDataCommand(
+                issuerData, issuerDataSignature, issuerDataCounter
+        )
+        if (!isCounterValid(issuerDataCounter)) {
+            completeNfcSession(TaskError.MissingCounter())
+            callback(TaskEvent.Completion(TaskError.MissingCounter()))
+        } else if (!verifySignature(command, cardEnvironment.cardId!!)) {
+            completeNfcSession(TaskError.VerificationFailed())
+            callback(TaskEvent.Completion(TaskError.VerificationFailed()))
+        }
+
+        sendCommand(command, cardEnvironment) { result ->
+            when (result) {
+                is CompletionResult.Success -> {
+                    completeNfcSession()
+                    callback(TaskEvent.Event(result.data))
+                    callback(TaskEvent.Completion())
+                }
+                is CompletionResult.Failure -> {
+                    if (result.error !is TaskError.UserCancelled) {
+                        completeNfcSession(result.error)
+                    }
+                    callback(TaskEvent.Completion(result.error))
+                }
+            }
+        }
+    }
+
+    private fun isCounterValid(issuerDataCounter: Int?): Boolean =
+            if (isCounterRequired()) issuerDataCounter != null else true
+
+    private fun isCounterRequired(): Boolean =
+            card.settingsMask?.contains(SettingsMask.protectIssuerDataAgainstReplay) != false
+
+    private fun verifySignature(command: WriteIssuerDataCommand, cardId: String): Boolean {
+        return command.verify(
+                issuerPublicKey ?: card.issuerPublicKey!!,
+                issuerDataSignature,
+                IssuerDataToVerify(cardId, issuerData, issuerDataCounter)
+        )
+    }
+}
\ No newline at end of file
diff --git a/tangem-core/src/main/java/com/tangem/tasks/WriteIssuerExtraDataTask.kt b/tangem-core/src/main/java/com/tangem/tasks/WriteIssuerExtraDataTask.kt
new file mode 100644
index 0000000000..f56ac1c5d5
--- /dev/null
+++ b/tangem-core/src/main/java/com/tangem/tasks/WriteIssuerExtraDataTask.kt
@@ -0,0 +1,113 @@
+package com.tangem.tasks
+
+import com.tangem.commands.Card
+import com.tangem.commands.SettingsMask
+import com.tangem.commands.WriteIssuerDataResponse
+import com.tangem.commands.WriteIssuerExtraDataCommand
+import com.tangem.commands.common.IssuerDataMode
+import com.tangem.commands.common.IssuerDataToVerify
+import com.tangem.common.CardEnvironment
+import com.tangem.common.CompletionResult
+
+/**
+ * This task performs [WriteIssuerExtraDataCommand] repeatedly until the issuer extra data is fully
+ * written on the card.
+ * @param issuerData Data provided by issuer.
+ * @param startingSignature Issuer’s signature with Issuer Data Private Key of [cardId],
+ * [issuerDataCounter] (if flags Protect_Issuer_Data_Against_Replay and
+ * Restrict_Overwrite_Issuer_Extra_Data are set in [SettingsMask]) and size of [issuerData].
+ * @param finalizingSignature Issuer’s signature with Issuer Data Private Key of [cardId],
+ * [issuerData] and [issuerDataCounter] (the latter one only if flags Protect_Issuer_Data_Against_Replay
+ * andRestrict_Overwrite_Issuer_Extra_Data are set in [SettingsMask]).
+ * @param issuerDataCounter An optional counter that protect issuer data against replay attack.
+ */
+internal class WriteIssuerExtraDataTask(
+        private val issuerData: ByteArray,
+        private val startingSignature: ByteArray,
+        private val finalizingSignature: ByteArray,
+        private val issuerPublicKey: ByteArray? = null,
+        private val issuerDataCounter: Int? = null
+) : Task<WriteIssuerDataResponse>() {
+
+    private lateinit var card: Card
+    private lateinit var cardEnvironment: CardEnvironment
+
+    override fun onRun(cardEnvironment: CardEnvironment,
+                       currentCard: Card?,
+                       callback: (result: TaskEvent<WriteIssuerDataResponse>) -> Unit) {
+
+        card = currentCard!!
+        this.cardEnvironment = cardEnvironment
+        val command = WriteIssuerExtraDataCommand(
+                issuerData, startingSignature, finalizingSignature, issuerDataCounter
+        )
+        if (!isCounterValid(issuerDataCounter)) {
+            completeNfcSession(TaskError.MissingCounter())
+            callback(TaskEvent.Completion(TaskError.MissingCounter()))
+        } else if (!verifySignatures(command)) {
+            completeNfcSession(TaskError.VerificationFailed())
+            callback(TaskEvent.Completion(TaskError.VerificationFailed()))
+        }
+
+        writeIssuerData(command, callback)
+    }
+
+    private fun writeIssuerData(
+            command: WriteIssuerExtraDataCommand,
+            callback: (result: TaskEvent<WriteIssuerDataResponse>) -> Unit) {
+
+        if (command.mode == IssuerDataMode.WriteExtraData) {
+            delegate?.onDelay(issuerData.size, command.offset, WriteIssuerExtraDataCommand.SINGLE_WRITE_SIZE)
+        }
+        sendCommand(command, cardEnvironment) { result ->
+            when (result) {
+
+                is CompletionResult.Success -> {
+                    when (command.mode) {
+                        IssuerDataMode.InitializeWritingExtraData -> {
+                            command.mode = IssuerDataMode.WriteExtraData
+                            writeIssuerData(command, callback)
+                            return@sendCommand
+                        }
+                        IssuerDataMode.WriteExtraData -> {
+                            command.offset += WriteIssuerExtraDataCommand.SINGLE_WRITE_SIZE
+                            if (command.offset >= issuerData.size) {
+                                command.mode = IssuerDataMode.FinalizeExtraData
+                            }
+                            writeIssuerData(command, callback)
+                            return@sendCommand
+                        }
+                        IssuerDataMode.FinalizeExtraData -> {
+                            completeNfcSession()
+                            callback(TaskEvent.Event(result.data))
+                            callback(TaskEvent.Completion())
+                        }
+                    }
+                }
+                is CompletionResult.Failure -> {
+                    if (result.error !is TaskError.UserCancelled) {
+                        completeNfcSession(result.error)
+                    }
+                    callback(TaskEvent.Completion(result.error))
+                }
+            }
+        }
+    }
+
+    private fun isCounterValid(issuerDataCounter: Int?): Boolean =
+            if (isCounterRequired()) issuerDataCounter != null else true
+
+    private fun isCounterRequired(): Boolean =
+            card.settingsMask?.contains(SettingsMask.protectIssuerDataAgainstReplay) != false
+
+    private fun verifySignatures(command: WriteIssuerExtraDataCommand): Boolean {
+        val publicKey = issuerPublicKey ?: card.issuerPublicKey!!
+        val cardId = cardEnvironment.cardId!!
+
+        val firstData = IssuerDataToVerify(cardId, null, issuerDataCounter, issuerData.size)
+        val secondData = IssuerDataToVerify(cardId, issuerData, issuerDataCounter)
+
+        return command.verify(publicKey, startingSignature, firstData) &&
+                command.verify(publicKey, finalizingSignature, secondData)
+    }
+}
\ No newline at end of file
diff --git a/tangem-core/src/test/java/com/tangem/common/apdu/CommandApduTest.kt b/tangem-core/src/test/java/com/tangem/common/apdu/CommandApduTest.kt
index f2228f497b..61d6ea71d3 100644
--- a/tangem-core/src/test/java/com/tangem/common/apdu/CommandApduTest.kt
+++ b/tangem-core/src/test/java/com/tangem/common/apdu/CommandApduTest.kt
@@ -2,7 +2,9 @@ package com.tangem.common.apdu
 
 import com.google.common.truth.Truth.assertThat
 import com.tangem.common.extensions.calculateSha256
+import com.tangem.common.extensions.toHexString
 import com.tangem.common.tlv.Tlv
+import com.tangem.common.tlv.TlvBuilder
 import com.tangem.common.tlv.TlvTag
 import org.junit.Test
 
@@ -11,12 +13,13 @@ class CommandApduTest {
 
     @Test
     fun `simple READ command to bytes`() {
-        val pinInBytes = byteArrayOf(-111, -76, -47, 66, -126, 63, 125, 32, -59, -16, -115, -10, -111,
-                34, -34, 67, -13, 95, 5, 122, -104, -115, -106, 25, -10, -45, 19, -124, -123, -55, -94, 3)
+        val pin = "000000"
+        val tlvBuilder = TlvBuilder()
+        tlvBuilder.append(TlvTag.Pin, pin)
         val commandApdu = CommandApdu(
                 Instruction.Read,
-                mutableListOf(Tlv(TlvTag.Pin, pinInBytes)))
-
+                tlvBuilder.serialize()
+        )
         val expected = byteArrayOf(0, -14, 0, 0, 0, 0, 34, 16, 32, -111, -76, -47, 66, -126, 63, 125,
             32, -59, -16, -115, -10, -111, 34, -34, 67, -13, 95, 5, 122, -104, -115, -106, 25, -10,
             -45, 19, -124, -123, -55, -94, 3)
@@ -27,17 +30,18 @@ class CommandApduTest {
 
     @Test
     fun `READ with terminal key to bytes`() {
-        val pinInBytes = byteArrayOf(-111, -76, -47, 66, -126, 63, 125, 32, -59, -16, -115, -10, -111,
-                34, -34, 67, -13, 95, 5, 122, -104, -115, -106, 25, -10, -45, 19, -124, -123, -55, -94, 3)
+        val pin = "000000"
         val terminalPublicKey = byteArrayOf(4, 80, -122, 58, -42, 74, -121, -82, -118, 47, -24, 60,
                 26, -15, -88, 64, 60, -75, 63, 83, -28, -122, -40, 81, 29, -83, -118, 4, -120, 126,
                 91, 35, 82, 44, -44, 112, 36, 52, 83, -94, -103, -6, -98, 119, 35, 119, 22, 16, 58,
                 -68, 17, -95, -33, 56, -123, 94, -42, -14, -18, 24, 126, -100, 88, 43, -90)
+        val tlvBuilder = TlvBuilder()
+        tlvBuilder.append(TlvTag.Pin, pin)
+        tlvBuilder.append(TlvTag.TerminalPublicKey, terminalPublicKey)
         val commandApdu = CommandApdu(
                 Instruction.Read,
-                mutableListOf(
-                        Tlv(TlvTag.Pin, pinInBytes),
-                        Tlv(TlvTag.TerminalPublicKey, terminalPublicKey)))
+                tlvBuilder.serialize()
+        )
 
         val expected = byteArrayOf(0, -14, 0, 0, 0, 0, 101, 16, 32, -111, -76, -47, 66, -126, 63,
             125, 32, -59, -16, -115, -10, -111, 34, -34, 67, -13, 95, 5, 122, -104, -115, -106, 25,
diff --git a/tangem-core/src/test/java/com/tangem/common/tlv/TlvMapperTest.kt b/tangem-core/src/test/java/com/tangem/common/tlv/TlvMapperTest.kt
index 3666e03120..bbe41dee8a 100644
--- a/tangem-core/src/test/java/com/tangem/common/tlv/TlvMapperTest.kt
+++ b/tangem-core/src/test/java/com/tangem/common/tlv/TlvMapperTest.kt
@@ -3,6 +3,7 @@ package com.tangem.common.tlv
 import com.google.common.truth.Truth.assertThat
 import com.tangem.commands.*
 import com.tangem.common.extensions.hexToBytes
+import com.tangem.tasks.TaskError
 import org.junit.Test
 import org.junit.jupiter.api.assertThrows
 import java.util.*
@@ -11,12 +12,12 @@ class TlvMapperTest {
 
     private val rawData = byteArrayOf(1, 8, -53, 34, 0, 0, 0, 2, 115, 116, 32, 11, 83, 77, 65, 82, 84, 32, 67, 65, 83, 72, 0, 2, 1, 2, -128, 6, 50, 46, 49, 49, 114, 0, 3, 65, 4, -49, 11, -50, -66, -121, -25, -2, 65, 65, -13, 14, 49, 27, -82, -33, -85, -113, 65, 20, 8, -39, -75, 57, 45, 65, -31, 35, 44, 38, 40, 63, -44, 113, -45, -75, -95, -118, 118, 29, 65, 117, -24, -53, 82, -72, 91, -20, -96, -77, -103, -14, -63, 52, -127, -123, -27, -16, -128, -67, -3, -104, -26, -22, 65, 10, 4, 0, 0, 126, 33, 12, 90, -127, 2, 0, 41, -126, 4, 7, -29, 5, 2, -125, 7, 84, 65, 78, 71, 69, 77, 0, -124, 3, 69, 84, 72, -122, 64, 111, -103, 48, -114, -40, 18, -103, 26, -102, -12, -38, -78, -90, -9, -98, 88, -47, -100, -24, 24, -105, -70, -72, 6, 94, -96, -77, 11, -123, -28, -118, 37, 63, 107, -55, -11, 23, -12, 13, -23, -121, -63, 36, -59, 70, 116, 91, -125, -34, -69, 23, -112, 6, 17, 4, -49, 68, -56, 29, -45, 81, 10, 97, 83, 48, 65, 4, -127, -106, -86, 75, 65, 10, -60, 74, 59, -100, -50, 24, -25, -66, 34, 106, -22, 7, 10, -52, -125, -87, -49, 103, 84, 15, -84, 73, -81, 37, 18, -97, 106, 83, -118, 40, -83, 99, 65, 53, -114, 60, 79, -103, 99, 6, 79, 126, 54, 83, 114, -90, 81, -45, 116, -27, -62, 60, -35, 55, -3, 9, -101, -14, 5, 10, 115, 101, 99, 112, 50, 53, 54, 107, 49, 0, 8, 4, 0, 15, 66, 64, 7, 1, 0, 9, 2, 11, -72, 96, 65, 4, -42, -5, -41, -84, -23, 88, 2, 86, -63, -118, -123, -10, -66, -82, -107, -68, -93, 111, 47, 93, -20, -86, 74, 28, 21, 81, 93, -21, -124, -57, -102, 55, 17, 84, -66, -68, -22, -128, 126, -99, -65, -54, -42, 59, -25, -21, -124, 5, 59, -16, -72, 73, 48, 16, -27, 103, -112, -73, 2, 96, -51, 41, -42, 116, 98, 4, 0, 15, 66, 52, 99, 4, 0, 0, 0, 13, 15, 1, 0)
 
-    private val tlvData = Tlv.tlvListFromBytes(rawData)
+    private val tlvData = Tlv.deserialize(rawData)
 
     private val tlvMapper = TlvMapper(tlvData!!)
 
     private val cardDataRaw: ByteArray = tlvMapper.map(TlvTag.CardData)
-    private val cardDataMapper = TlvMapper(Tlv.tlvListFromBytes(cardDataRaw)!!)
+    private val cardDataMapper = TlvMapper(Tlv.deserialize(cardDataRaw)!!)
 
     @Test
     fun `map optional when value is present`() {
@@ -34,21 +35,21 @@ class TlvMapperTest {
 
     @Test
     fun `map when value is null throws MissingTagException`() {
-        assertThrows<MissingTagException> {
+        assertThrows<TaskError.MissingTag> {
             tlvMapper.map<String>(TlvTag.TokenSymbol)
         }
     }
 
     @Test
     fun `map optional to wrong type throws WrongTypeException`() {
-        assertThrows<WrongTypeException> {
+        assertThrows<TaskError.WrongType> {
             tlvMapper.mapOptional<String?>(TlvTag.CardData)
         }
     }
 
     @Test
     fun `map to wrong type throws WrongTypeException`() {
-        assertThrows<WrongTypeException> {
+        assertThrows<TaskError.WrongType> {
             tlvMapper.map<String>(TlvTag.CardData)
         }
     }
@@ -88,7 +89,7 @@ class TlvMapperTest {
 
     @Test
     fun `map SigningMethods set of methods returns correct value`() {
-        val localMapper = TlvMapper(Tlv.tlvListFromBytes("070195".hexToBytes())!!)
+        val localMapper = TlvMapper(Tlv.deserialize("070195".hexToBytes())!!)
 
         val signingMethod: SigningMethod = localMapper.map(TlvTag.SigningMethod)
         assertThat(signingMethod.contains(SigningMethod.signHash))
@@ -125,7 +126,7 @@ class TlvMapperTest {
     @Test
     fun `map Enum with unknown code throws ConversionException error`() {
         val localMapper = TlvMapper(listOf(Tlv(TlvTag.ProductMask, byteArrayOf(5))))
-        assertThrows<ConversionException> {
+        assertThrows<TaskError.ConvertError> {
             localMapper.map<ProductMask>(TlvTag.ProductMask)
         }
     }
@@ -162,7 +163,7 @@ class TlvMapperTest {
     @Test
     fun `map Int with wrong value throws ConversionException`() {
         val localMapper = TlvMapper(listOf(Tlv(TlvTag.SignedHashes, byteArrayOf(1, 2, 3, 4, 5))))
-        assertThrows<ConversionException> {
+        assertThrows<TaskError.ConvertError> {
             localMapper.map<Int>(TlvTag.SignedHashes)
         }
     }
diff --git a/tangem-core/src/test/java/com/tangem/common/tlv/TlvTest.kt b/tangem-core/src/test/java/com/tangem/common/tlv/TlvTest.kt
index 4dcdecf66a..c2d1e0e09d 100644
--- a/tangem-core/src/test/java/com/tangem/common/tlv/TlvTest.kt
+++ b/tangem-core/src/test/java/com/tangem/common/tlv/TlvTest.kt
@@ -17,7 +17,7 @@ class TlvTest {
                 -10, -111, 34, -34, 67, -13, 95, 5, 122, -104, -115, -106, 25, -10, -45, 19, -124,
                 -123, -55, -94, 3)
 
-        assertThat(tlvs.toBytes())
+        assertThat(tlvs.serialize())
                 .isEqualTo(expected)
     }
 
@@ -34,7 +34,7 @@ class TlvTest {
                 -55, -94, 3, 1, 8, -53, 34, 0, 0, 0, 2, 115, 116, 22, 16, -82, -78, -31, 34, 66, -19,
                 -86, -1, 26, 8, 100, -126, -74, 20, -28, 83)
 
-        assertThat(tlvs.toBytes())
+        assertThat(tlvs.serialize())
                 .isEqualTo(expected)
     }
 
@@ -44,14 +44,14 @@ class TlvTest {
                 -10, -111, 34, -34, 67, -13, 95, 5, 122, -104, -115, -106, 25, -10, -45, 19, -124,
                 -123, -55, -94, 3)
 
-        val tlvs = Tlv.tlvListFromBytes(bytes)
+        val tlvs = Tlv.deserialize(bytes)
 
         assertThat(tlvs)
                 .isNotNull()
         assertThat(tlvs)
                 .isNotEmpty()
 
-        val pin = tlvs!!.find { it.tag == TlvTag.Pin  }?.value
+        val pin = tlvs!!.find { it.tag == TlvTag.Pin }?.value
         val pinExpected = "000000".calculateSha256()
 
         assertThat(pin)
@@ -65,14 +65,14 @@ class TlvTest {
                 -55, -94, 3, 1, 8, -53, 34, 0, 0, 0, 2, 115, 116, 22, 16, -82, -78, -31, 34, 66, -19,
                 -86, -1, 26, 8, 100, -126, -74, 20, -28, 83)
 
-        val tlvs = Tlv.tlvListFromBytes(bytes)
+        val tlvs = Tlv.deserialize(bytes)
 
         assertThat(tlvs)
                 .isNotNull()
         assertThat(tlvs)
                 .isNotEmpty()
 
-        val pin = tlvs!!.find { it.tag == TlvTag.Pin  }?.value
+        val pin = tlvs!!.find { it.tag == TlvTag.Pin }?.value
         val pinExpected = "000000".calculateSha256()
         assertThat(pin)
                 .isEqualTo(pinExpected)
@@ -91,13 +91,21 @@ class TlvTest {
     @Test
     fun `Bytes to TLVs, wrong values`() {
         val bytes = byteArrayOf(0)
-        val tlvs = Tlv.tlvListFromBytes(bytes)
-       assertThat(tlvs)
-               .isNull()
+        val tlvs = Tlv.deserialize(bytes)
+        assertThat(tlvs)
+                .isNull()
 
         val bytes1 = byteArrayOf(0, 0, 0, 0, 0, 0, 0)
-        val tlvs1 = Tlv.tlvListFromBytes(bytes1)
+        val tlvs1 = Tlv.deserialize(bytes1)
         assertThat(tlvs1)
                 .isNull()
     }
+
+    @Test
+    fun `parse Slix tag response`() {
+        val response = "03ff010f91010b550474616e67656d2e636f6d140f11616e64726f69642e636f6d3a706b67636f6d2e74616e67656d2e77616c6c65745411c974616e67656d2e636f6d3a77616c6c657490000c618102ffff8a0102820407e40109830b54414e47454d2053444b008403584c4d86400e71c1f060387029688254320b90abeae471bcafbbe8ea3880903bdb8d1cc389d032b982e1ffd7ef49e66f1780123b763dd2f3a9a9494eb0fad4ae8cf306672c60207c967a51077c14fc49d867f23b8d0eaf60cad479a56587e894571b7fb33690176140345fbe53f5be0ec871e91c317cde2bd0396d47e4b945c138c153b0271f636a73cf531df1bc54ac4fcdbce42f81b40d58e0265d34e28121a4c50fdfe329a97f6000fe000000000000000000000000000000000000000000000000000000000000000000000000000000"
+        val tlvs = Tlv.deserialize(response.hexToBytes(), true)
+        assertThat(tlvs)
+                .isNotEmpty()
+    }
 }
\ No newline at end of file
diff --git a/tangem-demo/build.gradle b/tangem-demo/build.gradle
index d67d457b53..be66873c49 100644
--- a/tangem-demo/build.gradle
+++ b/tangem-demo/build.gradle
@@ -36,7 +36,7 @@ dependencies {
     implementation project(':tangem-sdk')
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.core:core-ktx:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
diff --git a/tangem-demo/src/main/AndroidManifest.xml b/tangem-demo/src/main/AndroidManifest.xml
index 2235a4e852..f90fa6c597 100644
--- a/tangem-demo/src/main/AndroidManifest.xml
+++ b/tangem-demo/src/main/AndroidManifest.xml
@@ -16,6 +16,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
+
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -46,6 +47,32 @@
                 android:name="android.nfc.action.TECH_DISCOVERED"
                 android:resource="@xml/nfc_tech_filter" />
         </activity>
+
+      <activity android:name=".TestUserDataActivity">
+        <intent-filter>
+          <action android:name="android.nfc.action.NDEF_DISCOVERED" />
+          <category android:name="android.intent.category.DEFAULT" />
+          <data
+            android:host="www.tangem.com"
+            android:scheme="http" />
+          <data
+            android:host="www.tangem.com"
+            android:scheme="https" />
+          <data
+            android:host="tangem.com"
+            android:scheme="http" />
+          <data
+            android:host="tangem.com"
+            android:scheme="https" />
+        </intent-filter>
+        <intent-filter>
+          <action android:name="android.nfc.action.TECH_DISCOVERED" />
+        </intent-filter>
+
+        <meta-data
+          android:name="android.nfc.action.TECH_DISCOVERED"
+          android:resource="@xml/nfc_tech_filter" />
+      </activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/MainActivity.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/MainActivity.kt
index 52b2951309..01207d703d 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/MainActivity.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/MainActivity.kt
@@ -1,11 +1,10 @@
 package com.tangem.tangemtest
 
+import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.tangem.CardManager
-import com.tangem.tangem_sdk_new.DefaultCardManagerDelegate
-import com.tangem.tangem_sdk_new.NfcLifecycleObserver
-import com.tangem.tangem_sdk_new.nfc.NfcManager
+import com.tangem.tangem_sdk_new.extensions.init
 import com.tangem.tasks.ScanEvent
 import com.tangem.tasks.TaskError
 import com.tangem.tasks.TaskEvent
@@ -13,22 +12,17 @@ import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : AppCompatActivity() {
 
-    private val nfcManager = NfcManager()
-    private val cardManagerDelegate: DefaultCardManagerDelegate = DefaultCardManagerDelegate(nfcManager.reader)
-    private val cardManager = CardManager(nfcManager.reader, cardManagerDelegate)
-
+    private lateinit var cardManager: CardManager
     private lateinit var cardId: String
     private lateinit var issuerData: ByteArray
     private lateinit var issuerDataSignature: ByteArray
+    private var issuerDataCounter: Int = 1
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        nfcManager.setCurrentActivity(this)
-        cardManagerDelegate.activity = this
-
-        lifecycle.addObserver(NfcLifecycleObserver(nfcManager))
+        cardManager = CardManager.init(this)
 
         btn_scan?.setOnClickListener { _ ->
             cardManager.scanCard { taskEvent ->
@@ -38,6 +32,10 @@ class MainActivity : AppCompatActivity() {
                             is ScanEvent.OnReadEvent -> {
                                 // Handle returned card data
                                 cardId = (taskEvent.data as ScanEvent.OnReadEvent).card.cardId
+                                runOnUiThread {
+                                    tv_card_cid?.text = cardId
+                                    btn_create_wallet.isEnabled = true
+                                }
                             }
                             is ScanEvent.OnVerifyEvent -> {
                                 //Handle card verification
@@ -45,6 +43,8 @@ class MainActivity : AppCompatActivity() {
                                     tv_card_cid?.text = cardId
                                     btn_sign.isEnabled = true
                                     btn_read_issuer_data.isEnabled = true
+                                    btn_read_issuer_extra_data.isEnabled = true
+                                    btn_write_issuer_data.isEnabled = true
                                     btn_purge_wallet.isEnabled = true
                                     btn_create_wallet.isEnabled = true
                                 }
@@ -53,7 +53,7 @@ class MainActivity : AppCompatActivity() {
                     }
                     is TaskEvent.Completion -> {
                         if (taskEvent.error != null) {
-                            if (taskEvent.error is TaskError.UserCancelledError) {
+                            if (taskEvent.error is TaskError.UserCancelled) {
                                 // Handle case when user cancelled manually
                             }
                             // Handle other errors
@@ -105,6 +105,20 @@ class MainActivity : AppCompatActivity() {
                 }
             }
         }
+        btn_read_issuer_extra_data?.setOnClickListener { _ ->
+            cardManager.readIssuerExtraData(cardId) {
+                when (it) {
+                    is TaskEvent.Completion -> {
+                        if (it.error != null) runOnUiThread { tv_card_cid?.text = it.error!!::class.simpleName }
+                    }
+                    is TaskEvent.Event -> runOnUiThread {
+                        issuerDataCounter = (it.data.issuerDataCounter ?: 0) + 1
+                        btn_write_issuer_data.isEnabled = true
+                        tv_card_cid?.text = "Read ${it.data.issuerData.size} bytes of data."
+                    }
+                }
+            }
+        }
         btn_purge_wallet?.setOnClickListener { _ ->
             cardManager.purgeWallet(
                     cardId) {
@@ -127,10 +141,16 @@ class MainActivity : AppCompatActivity() {
                     }
                     is TaskEvent.Event -> runOnUiThread {
                         tv_card_cid?.text = it.data.status.name
+                        btn_sign.isEnabled = true
+                        btn_read_issuer_data.isEnabled = true
+                        btn_purge_wallet.isEnabled = true
+                        btn_create_wallet.isEnabled = false
+
                     }
                 }
             }
         }
+        btn_read_write_user_data?.setOnClickListener { startActivity(Intent(this, TestUserDataActivity::class.java)) }
     }
 
     private fun createSampleHashes(): Array<ByteArray> {
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/TestUserDataActivity.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/TestUserDataActivity.kt
new file mode 100644
index 0000000000..5b187df946
--- /dev/null
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/TestUserDataActivity.kt
@@ -0,0 +1,180 @@
+package com.tangem.tangemtest
+
+import android.os.Bundle
+import android.view.View
+import android.widget.CompoundButton
+import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
+import com.tangem.CardManager
+import com.tangem.commands.ReadUserDataResponse
+import com.tangem.commands.WriteUserDataResponse
+import com.tangem.common.CardEnvironment
+import com.tangem.tangem_sdk_new.extensions.init
+import com.tangem.tasks.ScanEvent
+import com.tangem.tasks.TaskError
+import com.tangem.tasks.TaskEvent
+import kotlinx.android.synthetic.main.activity_test_user_data.*
+import java.nio.charset.StandardCharsets
+
+/**
+[REDACTED_AUTHOR]
+ */
+class TestUserDataActivity: AppCompatActivity() {
+
+  private lateinit var cardManager: CardManager
+  private lateinit var writeOptions: WriteOptions
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    setContentView(R.layout.activity_test_user_data)
+
+    init()
+    initWriteOptions()
+  }
+
+  private fun init() {
+    cardManager = CardManager.init(this)
+
+    btn_scan?.setOnClickListener { _ ->
+      cardManager.scanCard { taskEvent ->
+        when (taskEvent) {
+          is TaskEvent.Event -> {
+            when (taskEvent.data) {
+              is ScanEvent.OnReadEvent -> {
+                // Handle returned card data
+                writeOptions.cardId = (taskEvent.data as ScanEvent.OnReadEvent).card.cardId
+                runOnUiThread { showReadWriteSection(true) }
+              }
+              is ScanEvent.OnVerifyEvent -> {
+                //Handle card verification
+              }
+            }
+          }
+          is TaskEvent.Completion -> {
+            if (taskEvent.error != null) {
+              if (taskEvent.error is TaskError.UserCancelled) {
+                // Handle case when user cancelled manually
+              }
+              // Handle other errors
+            }
+            // Handle completion
+          }
+        }
+      }
+    }
+
+    btn_write.setOnClickListener {
+      if (writeOptions.cardId == null) return@setOnClickListener
+
+      cardManager.writeUserData(
+          writeOptions.cardId !!,
+          writeOptions.userData,
+          writeOptions.userProtectedData,
+          writeOptions.userCounter,
+          writeOptions.userProtectedCounter
+      ) {
+        when (it) {
+          is TaskEvent.Completion -> handleError(tv_write_result, it.error)
+          is TaskEvent.Event -> {
+            runOnUiThread {
+              val data = it.data as? WriteUserDataResponse
+              if (data == null) {
+                tv_write_result.text = "Response doesn't match"
+                return@runOnUiThread
+              }
+              tv_write_result?.text = "Success"
+            }
+          }
+        }
+      }
+    }
+
+    btn_read.setOnClickListener {
+      if (writeOptions.cardId == null) return@setOnClickListener
+
+      cardManager.readUserData(writeOptions.cardId !!) {
+        when (it) {
+          is TaskEvent.Completion -> handleError(tv_read_result, it.error)
+          is TaskEvent.Event -> {
+            runOnUiThread {
+              val data = it.data as? ReadUserDataResponse
+              if (data == null) {
+                tv_read_result.text = "Response doesn't match"
+                return@runOnUiThread
+              }
+              tv_read_result?.text = "Success"
+
+              writeOptions.userData = data.userData
+              writeOptions.userProtectedData = data.userProtectedData
+              writeOptions.userCounter = data.userCounter
+              writeOptions.userProtectedCounter = data.userProtectedCounter
+
+              tv_card_cid.text = data.cardId
+              tv_data.text = String(data.userData, StandardCharsets.US_ASCII)
+              tv_protected_data.text = String(data.userProtectedData, StandardCharsets.US_ASCII)
+              tv_counter.text = data.userCounter.toString()
+              tv_protected_counter.text = data.userProtectedCounter.toString()
+            }
+
+          }
+        }
+      }
+    }
+  }
+
+  private fun handleError(tv: TextView, error: TaskError?) {
+    val er = error ?: return
+    if (er is TaskError.UserCancelled) return
+
+    runOnUiThread { tv.text = er::class.simpleName }
+  }
+
+  private fun initWriteOptions() {
+    writeOptions = WriteOptions()
+
+    chb_with_ud.setOnCheckedChangeListener { buttonView, isChecked -> writeOptions.updateData(buttonView) }
+    chb_with_ud_protected.setOnCheckedChangeListener { buttonView, isChecked -> writeOptions.updateProtectedData(buttonView) }
+    chb_with_counter.setOnCheckedChangeListener { buttonView, isChecked -> writeOptions.updateCounter(buttonView) }
+    chb_with_protected_counter.setOnCheckedChangeListener { buttonView, isChecked -> writeOptions.updateProtectedCounter(buttonView) }
+    chb_with_pin2.setOnCheckedChangeListener { buttonView, isChecked -> writeOptions.updatePin2(buttonView) }
+  }
+
+  private fun showReadWriteSection(show: Boolean) {
+    val state = if (show) View.VISIBLE else View.GONE
+    cl_read_write.visibility = state
+  }
+}
+
+class WriteOptions {
+  var cardId: String? = null
+  var userData: ByteArray? = null
+  var userProtectedData: ByteArray? = null
+  var userCounter: Int? = null
+  var userProtectedCounter: Int? = null
+  var pin2: String? = null
+
+  fun updateData(chbx: CompoundButton) {
+    val value = "simple user data".toByteArray()
+    userData = if (chbx.isChecked) value else null
+  }
+
+  fun updateProtectedData(chbx: CompoundButton) {
+    val value = "protected user data".toByteArray()
+    userProtectedData = if (chbx.isChecked) value else null
+  }
+
+  fun updateCounter(chbx: CompoundButton) {
+    val value = if (userCounter == null) 0 else userCounter !! + 1
+    userCounter = if (chbx.isChecked) value else null
+  }
+
+  fun updateProtectedCounter(chbx: CompoundButton) {
+    val value = if (userProtectedCounter == null) 0 else userProtectedCounter !! + 1
+    userProtectedCounter = if (chbx.isChecked) value else null
+  }
+
+  fun updatePin2(chbx: CompoundButton) {
+    val value = CardEnvironment.DEFAULT_PIN2
+    pin2 = if (chbx.isChecked) value else null
+  }
+}
\ No newline at end of file
diff --git a/tangem-demo/src/main/res/layout/activity_main.xml b/tangem-demo/src/main/res/layout/activity_main.xml
index 5759633c21..2af3ad92de 100644
--- a/tangem-demo/src/main/res/layout/activity_main.xml
+++ b/tangem-demo/src/main/res/layout/activity_main.xml
@@ -1,90 +1,116 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent">
+
+  <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/container"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
     <TextView
-        android:paddingBottom="48dp"
-        android:layout_marginTop="48dp"
-        android:id="@+id/tv_card_cid"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="16dp"
-        android:layout_marginBottom="80dp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:textAppearance="@style/TextAppearance.AppCompat.Large"/>
+      android:id="@+id/tv_card_cid"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="48dp"
+      android:layout_marginBottom="80dp"
+      android:padding="16dp"
+      android:paddingBottom="48dp"
+      android:textAppearance="@style/TextAppearance.AppCompat.Large"
+      app:layout_constraintLeft_toLeftOf="parent"
+      app:layout_constraintRight_toRightOf="parent"
+      app:layout_constraintTop_toTopOf="parent" />
 
     <Button
-        android:id="@+id/btn_scan"
-        android:layout_width="200dp"
-        android:layout_height="wrap_content"
-        android:text="Read and verify card"
-        app:layout_constraintVertical_bias="0.3"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+      android:id="@+id/btn_scan"
+      android:layout_width="200dp"
+      android:layout_height="wrap_content"
+      android:text="Read and verify card"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintLeft_toLeftOf="parent"
+      app:layout_constraintRight_toRightOf="parent"
+      app:layout_constraintTop_toTopOf="parent"
+      app:layout_constraintVertical_bias="0.25" />
 
     <Button
-        android:id="@+id/btn_sign"
-        android:layout_marginTop="24dp"
-        android:layout_width="200dp"
-        android:layout_height="wrap_content"
-        android:text="Sign transaction"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/btn_scan"
-        android:enabled="false"/>
+      android:id="@+id/btn_sign"
+      android:layout_width="200dp"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="16dp"
+      android:enabled="false"
+      android:text="Sign transaction"
+      app:layout_constraintLeft_toLeftOf="parent"
+      app:layout_constraintRight_toRightOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/btn_scan" />
 
     <Button
-        android:id="@+id/btn_read_issuer_data"
-        android:layout_marginTop="24dp"
-        android:layout_width="200dp"
-        android:layout_height="wrap_content"
-        android:text="Read issuer data"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/btn_sign"
-        android:enabled="false"/>
+      android:id="@+id/btn_read_issuer_data"
+      android:layout_width="200dp"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="16dp"
+      android:enabled="false"
+      android:text="Read issuer data"
+      app:layout_constraintLeft_toLeftOf="parent"
+      app:layout_constraintRight_toRightOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/btn_sign" />
 
     <Button
-        android:id="@+id/btn_write_issuer_data"
-        android:layout_marginTop="24dp"
-        android:layout_width="200dp"
-        android:layout_height="wrap_content"
-        android:text="Write issuer data"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/btn_read_issuer_data"
-        android:enabled="false"/>
+      android:id="@+id/btn_write_issuer_data"
+      android:layout_width="200dp"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="16dp"
+      android:enabled="false"
+      android:text="Write issuer data"
+      app:layout_constraintLeft_toLeftOf="parent"
+      app:layout_constraintRight_toRightOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/btn_read_issuer_data" />
 
     <Button
-        android:id="@+id/btn_purge_wallet"
-        android:layout_marginTop="24dp"
-        android:layout_width="200dp"
-        android:layout_height="wrap_content"
-        android:text="Purge wallet"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/btn_write_issuer_data"
-        android:enabled="false"/>
+      android:id="@+id/btn_read_issuer_extra_data"
+      android:layout_width="200dp"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="16dp"
+      android:enabled="false"
+      android:text="Read issuer extra data"
+      app:layout_constraintLeft_toLeftOf="parent"
+      app:layout_constraintRight_toRightOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/btn_write_issuer_data" />
 
     <Button
-        android:id="@+id/btn_create_wallet"
-        android:layout_marginTop="24dp"
-        android:layout_width="200dp"
-        android:layout_height="wrap_content"
-        android:text="Create wallet"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/btn_purge_wallet"
-        android:enabled="false"/>
+      android:id="@+id/btn_purge_wallet"
+      android:layout_width="200dp"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="16dp"
+      android:enabled="false"
+      android:text="Purge wallet"
+      app:layout_constraintLeft_toLeftOf="parent"
+      app:layout_constraintRight_toRightOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/btn_read_issuer_extra_data" />
 
+    <Button
+      android:id="@+id/btn_create_wallet"
+      android:layout_width="200dp"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="16dp"
+      android:enabled="false"
+      android:text="Create wallet"
+      app:layout_constraintLeft_toLeftOf="parent"
+      app:layout_constraintRight_toRightOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/btn_purge_wallet" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    <Button
+      android:id="@+id/btn_read_write_user_data"
+      android:layout_width="200dp"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="16dp"
+      android:text="Read/Write user data"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@+id/btn_create_wallet" />
+
+  </androidx.constraintlayout.widget.ConstraintLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/tangem-demo/src/main/res/layout/activity_test_user_data.xml b/tangem-demo/src/main/res/layout/activity_test_user_data.xml
new file mode 100644
index 0000000000..261a6efd64
--- /dev/null
+++ b/tangem-demo/src/main/res/layout/activity_test_user_data.xml
@@ -0,0 +1,238 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:orientation="vertical">
+
+  <Button
+    android:id="@+id/btn_scan"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal"
+    android:layout_marginTop="16dp"
+    android:text="Scan card" />
+
+  <androidx.constraintlayout.widget.ConstraintLayout
+    android:id="@+id/cl_read_write"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:animateLayoutChanges="true"
+    android:orientation="vertical"
+    android:visibility="gone">
+
+    <LinearLayout
+      android:id="@+id/linearLayout"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="16dp"
+      android:layout_marginEnd="16dp"
+      android:orientation="vertical"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent">
+
+      <CheckBox
+        android:id="@+id/chb_with_ud"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="With User data" />
+
+      <CheckBox
+        android:id="@+id/chb_with_ud_protected"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="With User protected data" />
+
+      <CheckBox
+        android:id="@+id/chb_with_pin2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="With Pin2" />
+
+      <CheckBox
+        android:id="@+id/chb_with_counter"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="With User counter" />
+
+      <CheckBox
+        android:id="@+id/chb_with_protected_counter"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="With User protected counter" />
+    </LinearLayout>
+
+    <Button
+      android:id="@+id/btn_write"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="16dp"
+      android:layout_marginTop="16dp"
+      android:text="Write user data"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@+id/linearLayout" />
+
+    <androidx.constraintlayout.widget.Guideline
+      android:id="@+id/guideline2"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:orientation="vertical"
+      app:layout_constraintGuide_begin="205dp" />
+
+    <TextView
+      android:id="@+id/tv_write_result"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:text="Write result"
+      app:layout_constraintBottom_toBottomOf="@+id/btn_write"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="@+id/guideline2"
+      app:layout_constraintTop_toTopOf="@+id/btn_write" />
+
+    <include
+      android:id="@+id/m_delimiter_h"
+      layout="@layout/m_delimiter_h"
+      android:layout_width="0dp"
+      android:layout_height="@dimen/delimiter_size"
+      android:layout_marginTop="16dp"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@+id/btn_write" />
+
+    <Button
+      android:id="@+id/btn_read"
+      android:layout_width="170dp"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="16dp"
+      android:layout_marginTop="16dp"
+      android:text="Read User Data"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@+id/m_delimiter_h" />
+
+    <TextView
+      android:id="@+id/tv_read_result"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:text="Read result"
+      app:layout_constraintBottom_toBottomOf="@+id/btn_read"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="@+id/guideline2"
+      app:layout_constraintTop_toTopOf="@+id/btn_read" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+      android:layout_width="0dp"
+      android:layout_height="0dp"
+      android:layout_marginStart="20dp"
+      android:layout_marginTop="8dp"
+      android:layout_marginEnd="16dp"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintHorizontal_bias="0.0"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@+id/btn_read"
+      app:layout_constraintVertical_bias="0.0">
+
+      <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_begin="156dp" />
+
+      <TextView
+        android:id="@+id/textView6"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Card Id:"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+      <TextView
+        android:id="@+id/textView7"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="User data:"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView6" />
+
+      <TextView
+        android:id="@+id/textView8"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="User protected data:"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView7" />
+
+      <TextView
+        android:id="@+id/textView9"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="User counter:"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView8" />
+
+      <TextView
+        android:id="@+id/textView10"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="User protected counter:"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView9" />
+
+
+      <TextView
+        android:id="@+id/tv_card_cid"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="@+id/guideline"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="card id" />
+
+      <TextView
+        android:id="@+id/tv_data"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        app:layout_constraintStart_toStartOf="@+id/tv_card_cid"
+        app:layout_constraintTop_toBottomOf="@+id/textView6"
+        tools:text="data" />
+
+      <TextView
+        android:id="@+id/tv_protected_data"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        app:layout_constraintStart_toStartOf="@+id/tv_data"
+        app:layout_constraintTop_toBottomOf="@+id/textView7"
+        tools:text="protected data" />
+
+      <TextView
+        android:id="@+id/tv_counter"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        app:layout_constraintStart_toStartOf="@+id/tv_protected_data"
+        app:layout_constraintTop_toBottomOf="@+id/tv_protected_data"
+        tools:text="counter" />
+
+      <TextView
+        android:id="@+id/tv_protected_counter"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        app:layout_constraintStart_toStartOf="@+id/tv_counter"
+        app:layout_constraintTop_toBottomOf="@+id/tv_counter"
+        tools:text="protected counter" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+  </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/tangem-demo/src/main/res/layout/m_delimiter_h.xml b/tangem-demo/src/main/res/layout/m_delimiter_h.xml
new file mode 100644
index 0000000000..4cf2bb6fbf
--- /dev/null
+++ b/tangem-demo/src/main/res/layout/m_delimiter_h.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:id="@+id/m_delimiter_h"
+  android:layout_width="match_parent"
+  android:layout_height="@dimen/delimiter_size"
+  android:background="@color/delimiter"
+  android:orientation="vertical" />
\ No newline at end of file
diff --git a/tangem-demo/src/main/res/values/colors.xml b/tangem-demo/src/main/res/values/colors.xml
index 69b22338c6..85ab4dd6a3 100644
--- a/tangem-demo/src/main/res/values/colors.xml
+++ b/tangem-demo/src/main/res/values/colors.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#008577</color>
-    <color name="colorPrimaryDark">#00574B</color>
-    <color name="colorAccent">#D81B60</color>
+    <color name="colorPrimary">#027aff</color>
+    <color name="colorPrimaryDark">#027AFF</color>
+    <color name="colorAccent">#027AFF</color>
+
+    <color name="delimiter">#000000</color>
 </resources>
diff --git a/tangem-demo/src/main/res/values/dimens.xml b/tangem-demo/src/main/res/values/dimens.xml
new file mode 100644
index 0000000000..544e3be648
--- /dev/null
+++ b/tangem-demo/src/main/res/values/dimens.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+  <dimen name="delimiter_size">1dp</dimen>
+
+</resources>
\ No newline at end of file
diff --git a/tangem-demo/src/main/res/xml/nfc_tech_filter.xml b/tangem-demo/src/main/res/xml/nfc_tech_filter.xml
index 2b794e0d65..1773c9e9b4 100644
--- a/tangem-demo/src/main/res/xml/nfc_tech_filter.xml
+++ b/tangem-demo/src/main/res/xml/nfc_tech_filter.xml
@@ -3,5 +3,6 @@
     <tech-list>
         <tech>android.nfc.tech.IsoDep</tech>
         <tech>android.nfc.tech.Ndef</tech>
+        <tech>android.nfc.tech.NfcV</tech>
     </tech-list>
 </resources>
\ No newline at end of file
diff --git a/tangem-sdk-android-config/README.md b/tangem-sdk-android-config/README.md
new file mode 100644
index 0000000000..e4037ddaae
--- /dev/null
+++ b/tangem-sdk-android-config/README.md
@@ -0,0 +1,231 @@
+
+[![Release](https://jitpack.io/v/Tangem/tangem-sdk-android.svg)]
+
+# Welcome to Tangem
+
+The Tangem card is a self-custodial hardware wallet for blockchain assets. The main functions of Tangem cards are to securely create and store a private key from a blockchain wallet and sign blockchain transactions. The Tangem card does not allow users to import/export, backup/restore private keys, thereby guaranteeing that the wallet is unique and unclonable. 
+
+- [Getting Started](#getting-started)
+	- [Requirements](#requirements)
+	- [Installation](#installation)
+- [Usage](#usage)
+	- [Initialization](#initialization)
+	- [Card interaction](#card-interaction)
+		- [Scan card](#scan-card)
+		- [Sign](#sign)
+- [Customization](#customization)
+	- [UI](#ui)
+	- [Tasks](#tasks)
+	- [Localization](#localization)
+
+
+## Getting Started
+
+### Requirements
+Android with minimal SDK version of 21 and a device with NFC support
+
+### Installation
+
+1) Add Tangem library to the project:
+
+Add to a project build.gradle file:
+
+```gradle
+allprojects {
+    repositories {
+        maven { url "https://jitpack.io" }
+    }
+}
+```
+
+And add Tangem library to the dependencies (in an app or module build.gradle file):
+
+```gradle 
+dependencies {
+    implementation "com.github.tangem.tangem-sdk-android:tangem-core:$latestVersionOfCore"
+    implementation "com.github.tangem.tangem-sdk-android:tangem-sdk:$latestVersionOfSdk"
+}
+```
+Tangem Core is a JVM library (without Android dependencies) that provides core functionality of interacting with Tangem cards.
+Tangem Sdk is an Android library that implements NFC interaction between Android devices and Tangem cards and graphical interface for this  interaction. 
+
+2) Add res file ‘tech_filter’ with the following:
+
+```xml
+<resources>
+   <tech-list>
+       <tech>android.nfc.tech.IsoDep</tech>
+       <tech>android.nfc.tech.Ndef</tech>
+       <tech>android.nfc.tech.NfcV</tech>
+   </tech-list>
+</resources>
+```
+
+3) Add to Manifest:
+```xml
+<intent-filter>
+               <action android:name=“android.nfc.action.TECH_DISCOVERED” />
+</intent-filter>
+<meta-data
+               android:name=“android.nfc.action.TECH_DISCOVERED”
+               android:resource=“@xml/tech_filter” />
+```
+
+## Usage
+
+Tangem SDK is a self-sufficient solution that implements a card abstraction model, methods of interaction with the card and interactions with the user via UI.
+
+### Initialization
+To get started, you need to create an instance of the `CardManager` class. It provides the simple way of interacting with the card. 
+Our default implementation of `CardManager` requires `NfcReader` and `DefaultCardManagerDelegate`.
+
+
+```kotlin
+private val nfcManager = NfcManager()
+private val cardManagerDelegate: DefaultCardManagerDelegate = DefaultCardManagerDelegate(nfcManager.reader)
+private val cardManager = CardManager(nfcManager.reader, cardManagerDelegate)
+```
+
+NfcManager requires a reference to activity in order to use Android API for interacting with NFC.  DefaultCardManagerDelegate requires a reference to activity in order to render views. 
+
+```kotlin
+nfcManager.setCurrentActivity(this)
+cardManagerDelegate.activity = this
+```
+
+```kotlin
+lifecycle.addObserver(NfcLifecycleObserver(nfcManager))
+```
+
+Default implementation of `NfcManager`, `CardReader` and `CardManagerDelegate` allows you to start using CardManager in your application without any additional setup.
+
+You can also provide your implementations of `CardReader` and `CardManagerDelegate`.
+You can read more about this in [Customization](#сustomization).
+
+### Tasks
+
+#### Scan card 
+To start using any card, you first need to read it using the `scanCard()` method. This method launches an NFC session, and once it’s connected with the card, it obtains the card data. Optionally, if the card contains a wallet (private and public key pair), it proves that the wallet owns a private key that corresponds to a public one.
+
+Example:
+
+```kotlin
+cardManager.scanCard { taskEvent ->
+    when (taskEvent) {
+        is TaskEvent.Event<ScanEvent> -> {
+            when (taskEvent.data) {
+                is ScanEvent.OnReadEvent -> {
+                    // Handle returned card data
+                    cardId = (taskEvent.data as ScanEvent.OnReadEvent).card.cardId
+                    // Switch to UI thread to show results in UI
+                    runOnUiThread {}
+                }
+                is ScanEvent.OnVerifyEvent -> {
+                    //Handle card verification
+                    val isGenuine = (taskEvent.data as ScanEvent.OnVerifyEvent).isGenuine
+                }
+            }
+    }
+        is TaskEvent.Completion<ScanEvent> -> {
+            if (taskEvent.error != null) {
+                if (taskEvent.error is TaskError.UserCancelledError) {
+                    // Handle case when user cancelled manually
+                }
+                // Handle other errors
+            }
+            // Handle completion
+        }
+    }
+}
+
+```
+
+Communication with the card is an asynchronous operation. In order to get a result for the method, you need to subscribe to the task callback. In order to render the callback results on UI, you need to switch to the main thread.
+
+Every task can invoke callback several times with different events:
+
+`Completion<T>(val error: TaskError? = null)` – this event is triggered only once when task is completely finished. It means that it's the final callback. If error is not nil, then something went wrong during the operation.
+
+`Event<T>(val data: T)` –  this event is triggered when one of operations inside the task is completed. 
+
+**Possible events of the Scan card task:**
+
+`OnReadEvent(val result: Card)` – this event is triggered after the card has been successfully read. In addition, the obtained card object is contained inside the enum. At this stage, the authenticity of the card is ***NOT*** verified.
+
+`OnVerifyEvent(val isGenuine: Boolean)` – this event is triggered when the card’s authenticity has been verified. If the card is authentic, isGenuine will be set to true, otherwise, it will be set to false.
+
+#### Sign
+This method allows you to sign one or multiple hashes. Simultaneous signing of array of hashes in a single SIGN command is required to support Bitcoin-type multi-input blockchains (UTXO). The SIGN command will return a corresponding array of signatures.
+
+```kotlin
+cardManager.sign(
+        hashes = arrayOf(hash1, hash2),
+        cardId = card.cardId) { taskEvent ->
+    when (taskEvent) {
+        is TaskEvent.Event -> {
+        // Handle sign response data
+        val signResponse = taskEvent.data
+        }
+        is TaskEvent.Completion<ScanEvent> -> {
+            if (taskEvent.error != null) {
+                if (taskEvent.error is TaskError.UserCancelledError) {
+                    // Handle case when user cancelled manually
+                }
+                // Handle other errors
+            }
+            // Handle completion
+        }
+    }
+}
+```
+
+## Customization
+### UI
+If the interaction with user is required, the SDK performs the entire cycle of this interaction. In order to change the appearance or behavior of the user UI, you can provide you own implementation of the `CardManagerDelegate` inteface. After this, initialize the `CardManager` class with your delegate class.
+
+```kolin
+val myCardManagerDelegate = MyCardManagerDelegate()
+val cardManager = CardManager(cardManagerDelegate = myCardManagerDelegate)
+```
+
+> If you pass null instead of `cardManagerDelegate`, the SDK won’t be able to process errors that require user intervention and return them to `.failure(let error)`.
+
+### Tasks
+`CardManager` only covers general tasks. If you want to trigger card commands in a certain order, you need to create your own task.
+
+To do this, you need to create a subclass of the `Task` class, and override the `onRun(..)` method.
+
+Then call the `runTask(..)` method of the `CardManager` class with you task.
+
+```kotlin
+val task = YourTask()
+cardManager.runTask(task) { taskEvent ->
+    // Handle your events
+}
+```
+> For example, you want to read the card and immediately sign a transaction on it. In such a case, you need to inherit from the `Task` class and override the `onRun(..)` method, in which you implement the required behavior.
+
+It’s possible to run just one command without the need to create a separate task by using the `runCommand(..)` method.
+> For example, if you need to read the card details, but don’t need to check the authenticity. 
+```kotlin
+// Create command
+val readCommand = ReadCardCommand()
+// Run command with the callback
+cardManager.runCommand(readCommand) { taskEvent ->
+    when (taskEvent) {
+        is TaskEvent.Event -> {
+            // Handle returned card data
+            val card: Card = taskEvent.data
+        }
+        is TaskEvent.Completion -> {
+            if (taskEvent.error != null) {
+                if (taskEvent.error is TaskError.UserCancelledError) {
+                    // Handle case when user cancelled manually
+                }
+                // Handle other errors
+            }
+            // Handle completion
+        }
+    }
+}
+```
\ No newline at end of file
diff --git a/tangem-sdk-android-config/build.gradle b/tangem-sdk-android-config/build.gradle
new file mode 100644
index 0000000000..fd31859e1c
--- /dev/null
+++ b/tangem-sdk-android-config/build.gradle
@@ -0,0 +1,26 @@
+buildscript {
+    apply from: 'dependencies.gradle'
+
+    repositories {
+        google()
+        jcenter()
+        maven { url 'https://maven.fabric.io/public' }
+    }
+    dependencies {
+        classpath "com.android.tools.build:gradle:$versions.build_gradle"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"
+        classpath "com.github.dcendents:android-maven-gradle-plugin:2.1"
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+        maven { url 'https://jitpack.io' }
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
diff --git a/tangem-sdk-android-config/settings.gradle b/tangem-sdk-android-config/settings.gradle
new file mode 100644
index 0000000000..a3bed452ff
--- /dev/null
+++ b/tangem-sdk-android-config/settings.gradle
@@ -0,0 +1 @@
+include ':tangem-core', ':tangem-sdk', ':tangem-demo'
diff --git a/tangem-sdk-old/build.gradle b/tangem-sdk-old/build.gradle
index 9ca113d488..e7ef5a0015 100644
--- a/tangem-sdk-old/build.gradle
+++ b/tangem-sdk-old/build.gradle
@@ -1,6 +1,5 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'com.github.dcendents.android-maven'
 
 group='com.tangem'
 
@@ -51,7 +50,7 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
 
 }
 repositories {
diff --git a/tangem-sdk/build.gradle b/tangem-sdk/build.gradle
index ca1b2e5123..e16a3e03a0 100644
--- a/tangem-sdk/build.gradle
+++ b/tangem-sdk/build.gradle
@@ -1,9 +1,11 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
+apply from: '../dependencies.gradle'
+apply from: '../jitpack.gradle'
 
-group = 'com.github.TangemCash'
-version '0.1.0'
+group = "$jitpackSdk.group"
+version "$jitpackSdk.version"
 
 android {
     compileSdkVersion 29
@@ -38,18 +40,21 @@ android {
 dependencies {
     implementation project(':tangem-core')
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'com.google.android.material:material:1.1.0-beta01'
+    implementation 'com.google.android.material:material:1.1.0'
     implementation 'com.skyfishjy.ripplebackground:library:1.0.1'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 
     implementation 'androidx.core:core-ktx:1.1.0'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
-    implementation "androidx.lifecycle:lifecycle-runtime:2.1.0"
-    implementation "androidx.lifecycle:lifecycle-common-java8:2.1.0"
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+    implementation "androidx.lifecycle:lifecycle-runtime:2.2.0"
+    implementation "androidx.lifecycle:lifecycle-common-java8:2.2.0"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:1.3.61"
+
+    implementation 'at.favre.lib:armadillo:0.9.0'
+
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    implementation "org.jetbrains.kotlin:kotlin-reflect:1.3.50"
 }
diff --git a/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/DefaultCardManagerDelegate.kt b/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/DefaultCardManagerDelegate.kt
index 8f37eb0c1c..400ab3f07f 100644
--- a/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/DefaultCardManagerDelegate.kt
+++ b/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/DefaultCardManagerDelegate.kt
@@ -1,12 +1,17 @@
 package com.tangem.tangem_sdk_new
 
+import android.animation.ObjectAnimator
+import android.view.HapticFeedbackConstants
 import android.view.View
+import android.view.animation.DecelerateInterpolator
 import androidx.fragment.app.FragmentActivity
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.tangem.CardManagerDelegate
 import com.tangem.Log
 import com.tangem.LoggerInterface
 import com.tangem.common.CompletionResult
+import com.tangem.tangem_sdk_new.extensions.hide
+import com.tangem.tangem_sdk_new.extensions.show
 import com.tangem.tangem_sdk_new.nfc.NfcReader
 import com.tangem.tangem_sdk_new.ui.NfcEnableDialog
 import com.tangem.tangem_sdk_new.ui.TouchCardAnimation
@@ -28,13 +33,13 @@ class DefaultCardManagerDelegate(private val reader: NfcReader) : CardManagerDel
         setLogger()
     }
 
-    override fun onNfcSessionStarted() {
+    override fun onNfcSessionStarted(cardId: String?) {
         reader.readingCancelled = false
-        postUI { showReadingDialog(activity) }
+        postUI { showReadingDialog(activity, cardId) }
         if (!reader.nfcEnabled) showNFCEnableDialog()
     }
 
-    private fun showReadingDialog(activity: FragmentActivity) {
+    private fun showReadingDialog(activity: FragmentActivity, cardId: String?) {
         val dialogView = activity.getLayoutInflater().inflate(R.layout.nfc_bottom_sheet, null)
         readingDialog = BottomSheetDialog(activity)
         readingDialog?.setContentView(dialogView)
@@ -46,6 +51,11 @@ class DefaultCardManagerDelegate(private val reader: NfcReader) : CardManagerDel
                     activity, readingDialog!!.ivHandCardHorizontal,
                     readingDialog!!.ivHandCardVertical, readingDialog!!.llHand, readingDialog!!.llNfc)
             nfcDeviceAntenna.init()
+            if (cardId != null) {
+                readingDialog?.tvCard?.visibility = View.VISIBLE
+                readingDialog?.tvCardId?.visibility = View.VISIBLE
+                readingDialog?.tvCardId?.text = cardId
+            }
         }
         readingDialog?.setOnCancelListener {
             reader.readingCancelled = true
@@ -60,21 +70,63 @@ class DefaultCardManagerDelegate(private val reader: NfcReader) : CardManagerDel
         activity.supportFragmentManager.let { nfcEnableDialog?.show(it, NfcEnableDialog.TAG) }
     }
 
-    override fun onSecurityDelay(ms: Int) {
+    override fun onSecurityDelay(ms: Int, totalDurationSeconds: Int) {
         postUI {
-            readingDialog?.lTouchCard?.visibility = View.GONE
+            readingDialog?.lTouchCard?.hide()
             readingDialog?.tvRemainingTime?.text = ms.div(100).toString()
-            readingDialog?.flSecurityDelay?.visibility = View.VISIBLE
+            readingDialog?.flSecurityDelay?.show()
             readingDialog?.tvTaskTitle?.text = activity.getText(R.string.dialog_security_delay)
             readingDialog?.tvTaskText?.text =
                     activity.getText(R.string.dialog_security_delay_description)
+
+            performHapticFeedback()
+
+            if (readingDialog?.pbSecurityDelay?.max != totalDurationSeconds) {
+                readingDialog?.pbSecurityDelay?.max = totalDurationSeconds
+            }
+            readingDialog?.pbSecurityDelay?.progress = totalDurationSeconds - ms + 100
+
+            val animation = ObjectAnimator.ofInt(
+                    readingDialog?.pbSecurityDelay,
+                    "progress",
+                    totalDurationSeconds - ms,
+                    totalDurationSeconds - ms + 100)
+            animation.duration = 500
+            animation.interpolator = DecelerateInterpolator()
+            animation.start()
+        }
+    }
+
+    override fun onDelay(total: Int, current: Int, step: Int) {
+        postUI {
+            readingDialog?.lTouchCard?.hide()
+            readingDialog?.flSecurityDelay?.show()
+            readingDialog?.tvRemainingTime?.text = (((total - current) / step) + 1).toString()
+            readingDialog?.tvTaskTitle?.text = "Operation in process"
+            readingDialog?.tvTaskText?.text = "Please hold the card firmly until the operation is completed…"
+
+            performHapticFeedback()
+
+            if (readingDialog?.pbSecurityDelay?.max != total) {
+                readingDialog?.pbSecurityDelay?.max = total
+            }
+            readingDialog?.pbSecurityDelay?.progress = current
+
+            val animation = ObjectAnimator.ofInt(
+                    readingDialog?.pbSecurityDelay,
+                    "progress",
+                    current,
+                    current + step)
+            animation.duration = 300
+            animation.interpolator = DecelerateInterpolator()
+            animation.start()
         }
     }
 
     override fun onTagLost() {
         postUI {
-            readingDialog?.lTouchCard?.visibility = View.VISIBLE
-            readingDialog?.flSecurityDelay?.visibility = View.GONE
+            readingDialog?.lTouchCard?.show()
+            readingDialog?.flSecurityDelay?.hide()
             readingDialog?.tvTaskTitle?.text = activity.getText(R.string.dialog_ready_to_scan)
             readingDialog?.tvTaskText?.text = activity.getText(R.string.dialog_scan_text)
         }
@@ -82,22 +134,24 @@ class DefaultCardManagerDelegate(private val reader: NfcReader) : CardManagerDel
 
     override fun onNfcSessionCompleted() {
         postUI {
-            readingDialog?.lTouchCard?.visibility = View.GONE
-            readingDialog?.flSecurityDelay?.visibility = View.GONE
-            readingDialog?.flCompletion?.visibility = View.VISIBLE
+            readingDialog?.lTouchCard?.hide()
+            readingDialog?.flSecurityDelay?.hide()
+            readingDialog?.flCompletion?.show()
             readingDialog?.ivCompletion?.setImageDrawable(activity.getDrawable(R.drawable.ic_done_135dp))
+            performHapticFeedback()
         }
         postUI(300) { readingDialog?.dismiss() }
     }
 
-    override fun onError(error: TaskError?) {
+    override fun onError(error: TaskError) {
         postUI {
-            readingDialog?.lTouchCard?.visibility = View.GONE
-            readingDialog?.flSecurityDelay?.visibility = View.GONE
-            readingDialog?.flCompletion?.visibility = View.VISIBLE
-            readingDialog?.ivCompletion?.setImageDrawable(activity.getDrawable(R.drawable.ic_error_outline_135dp))
+            readingDialog?.lTouchCard?.hide()
+            readingDialog?.flSecurityDelay?.hide()
+            readingDialog?.flCompletion?.hide()
+            readingDialog?.flError?.show()
             readingDialog?.tvTaskTitle?.text = activity.getText(R.string.dialog_error)
-            readingDialog?.tvTaskText?.text = if (error != null) error::class.simpleName else ""
+            readingDialog?.tvTaskText?.text = "${error::class.simpleName}: ${error.code}"
+            performHapticFeedback()
         }
     }
 
@@ -105,6 +159,12 @@ class DefaultCardManagerDelegate(private val reader: NfcReader) : CardManagerDel
         TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
+    private fun performHapticFeedback() {
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+            readingDialog?.llHeader?.isHapticFeedbackEnabled = true
+            readingDialog?.llHeader?.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
+        }
+    }
 
     private fun setLogger() {
         Log.setLogger(
diff --git a/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/TerminalKeysStorage.kt b/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/TerminalKeysStorage.kt
new file mode 100644
index 0000000000..70b2cfa431
--- /dev/null
+++ b/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/TerminalKeysStorage.kt
@@ -0,0 +1,56 @@
+package com.tangem.tangem_sdk_new
+
+import android.app.Application
+import android.content.SharedPreferences
+import at.favre.lib.armadillo.Armadillo
+import com.tangem.common.KeyPair
+import com.tangem.common.TerminalKeysService
+import com.tangem.common.extensions.hexToBytes
+import com.tangem.common.extensions.toHexString
+import com.tangem.crypto.CryptoUtils
+
+
+/**
+ * Service for managing Terminal keypair, used for Linked Terminal feature.
+ * Needs to be provided to [com.tangem.CardManager] by calling [com.tangem.CardManager.setTerminalKeysService]
+ * Linked Terminal feature can be disabled manually by editing [com.tangem.Config].
+ * @param applicationContext is required to retrieve an instance of [SharedPreferences]
+ */
+class TerminalKeysStorage(applicationContext: Application): TerminalKeysService {
+
+    private val preferences: SharedPreferences by lazy {
+        Armadillo.create(applicationContext, PREFERENCES_KEY)
+                .encryptionFingerprint(applicationContext)
+                .build()
+    }
+
+    /**
+     * Retrieves generated keys from encrypted shared preferences if the keys exist.
+     * Generates new and stores them in encrypted shared preferences otherwise
+     */
+    override fun getKeys(): KeyPair {
+        val privateKey = preferences.getString(TERMINAL_PRIVATE_KEY, null)?.hexToBytes()
+        val publicKey = preferences.getString(TERMINAL_PUBLIC_KEY, null)?.hexToBytes()
+        return if (privateKey == null || publicKey == null) {
+            generateAndSaveKeys()
+        } else {
+            KeyPair(publicKey, privateKey)
+        }
+    }
+
+    private fun generateAndSaveKeys(): KeyPair {
+        val privateKey = CryptoUtils.generateRandomBytes(32)
+        val publicKey = CryptoUtils.generatePublicKey(privateKey)
+        preferences.edit().putString(TERMINAL_PRIVATE_KEY, privateKey.toHexString()).apply()
+        preferences.edit().putString(TERMINAL_PUBLIC_KEY, publicKey.toHexString()).apply()
+        return KeyPair(publicKey, privateKey)
+    }
+
+
+    companion object {
+        const val PREFERENCES_KEY = "myPrefs"
+        const val TERMINAL_PRIVATE_KEY = "terminalPrivateKey"
+        const val TERMINAL_PUBLIC_KEY = "terminalPublicKey"
+    }
+
+}
\ No newline at end of file
diff --git a/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/extensions/CardManager.kt b/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/extensions/CardManager.kt
new file mode 100644
index 0000000000..b2364c13cf
--- /dev/null
+++ b/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/extensions/CardManager.kt
@@ -0,0 +1,21 @@
+package com.tangem.tangem_sdk_new.extensions
+
+import androidx.fragment.app.FragmentActivity
+import com.tangem.CardManager
+import com.tangem.tangem_sdk_new.DefaultCardManagerDelegate
+import com.tangem.tangem_sdk_new.NfcLifecycleObserver
+import com.tangem.tangem_sdk_new.TerminalKeysStorage
+import com.tangem.tangem_sdk_new.nfc.NfcManager
+
+fun CardManager.Companion.init(activity: FragmentActivity): CardManager {
+    val nfcManager = NfcManager().apply {
+        this.setCurrentActivity(activity)
+        activity.lifecycle.addObserver(NfcLifecycleObserver(this))
+    }
+    val cardManagerDelegate = DefaultCardManagerDelegate(nfcManager.reader).apply {
+        this.activity = activity
+    }
+    return CardManager(nfcManager.reader, cardManagerDelegate).apply {
+        this.setTerminalKeysService(TerminalKeysStorage(activity.application))
+    }
+}
\ No newline at end of file
diff --git a/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/extensions/View.kt b/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/extensions/View.kt
new file mode 100644
index 0000000000..008f194709
--- /dev/null
+++ b/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/extensions/View.kt
@@ -0,0 +1,11 @@
+package com.tangem.tangem_sdk_new.extensions
+
+import android.view.View
+
+internal fun View.show() {
+    this.visibility = View.VISIBLE
+}
+
+internal fun View.hide() {
+    this.visibility = View.GONE
+}
\ No newline at end of file
diff --git a/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/nfc/NfcManager.kt b/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/nfc/NfcManager.kt
index cdcb94c1c3..d8436d8e3b 100644
--- a/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/nfc/NfcManager.kt
+++ b/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/nfc/NfcManager.kt
@@ -13,7 +13,7 @@ import android.os.Bundle
 import com.tangem.Log
 
 /**
- * Helps use of NFC, leveraging Android NFC functionality.
+ * Helps use NFC, leveraging Android NFC functionality.
  * Launches [NfcAdapter], manages it with [Activity] lifecycle,
  * enables and disables Nfc Reading Mode, receives NFC [Tag].
  */
@@ -87,6 +87,7 @@ class NfcManager : NfcAdapter.ReaderCallback {
     companion object {
         // reader mode flags: listen for type A (not B), skipping ndef check
         private const val READER_FLAGS = NfcAdapter.FLAG_READER_NFC_A or
+                NfcAdapter.FLAG_READER_NFC_V or
                 NfcAdapter.FLAG_READER_SKIP_NDEF_CHECK or
                 NfcAdapter.FLAG_READER_NO_PLATFORM_SOUNDS
     }
diff --git a/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/nfc/NfcReader.kt b/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/nfc/NfcReader.kt
index 9b54bd9ffe..5ba6b11d4b 100644
--- a/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/nfc/NfcReader.kt
+++ b/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/nfc/NfcReader.kt
@@ -3,6 +3,7 @@ package com.tangem.tangem_sdk_new.nfc
 import android.nfc.Tag
 import android.nfc.TagLostException
 import android.nfc.tech.IsoDep
+import android.nfc.tech.NfcV
 import com.tangem.CardReader
 import com.tangem.Log
 import com.tangem.common.CompletionResult
@@ -37,12 +38,12 @@ class NfcReader : CardReader {
                 // Stops reading and sends failure callback to a task
                 // if reading is cancelled (when user closes nfc bottom sheet dialog).
                 closeSession()
-                callback?.invoke(CompletionResult.Failure(TaskError.UserCancelledError()))
+                callback?.invoke(CompletionResult.Failure(TaskError.UserCancelled()))
             }
         }
 
-    var data: ByteArray? = null
-    var callback: ((response: CompletionResult<ResponseApdu>) -> Unit)? = null
+    private var data: ByteArray? = null
+    private var callback: ((response: CompletionResult<ResponseApdu>) -> Unit)? = null
 
     override fun openSession() {
         readingActive = true
@@ -66,7 +67,7 @@ class NfcReader : CardReader {
 
     private fun transceiveData() {
         if (readingCancelled) {
-            callback?.invoke(CompletionResult.Failure(TaskError.UserCancelledError()))
+            callback?.invoke(CompletionResult.Failure(TaskError.UserCancelled()))
             return
         }
         if (data == null) return
@@ -90,6 +91,7 @@ class NfcReader : CardReader {
     }
 
     fun onTagDiscovered(tag: Tag?) {
+        NfcV.get(tag)?.let { onNfcVDiscovered(it) }
         isoDep = IsoDep.get(tag)
         transceiveData()
     }
@@ -103,4 +105,16 @@ class NfcReader : CardReader {
         Log.i(this::class.simpleName!!, "Nfc session is started")
     }
 
+    private fun onNfcVDiscovered(nfcV: NfcV) {
+        val response = SlixTagReader().transceive(nfcV)
+        when (response) {
+            is SlixReadResult.Failure -> {
+                Log.e(this::class.simpleName!!, "${response.exception.message}")
+                callback?.invoke(CompletionResult.Failure(TaskError.ErrorProcessingCommand()))
+            }
+            is SlixReadResult.Success -> {
+                 callback?.invoke(CompletionResult.Success(ResponseApdu(response.data)))
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/nfc/SlixTagReader.kt b/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/nfc/SlixTagReader.kt
new file mode 100644
index 0000000000..587ded11a3
--- /dev/null
+++ b/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/nfc/SlixTagReader.kt
@@ -0,0 +1,123 @@
+package com.tangem.tangem_sdk_new.nfc
+
+import android.nfc.NdefMessage
+import android.nfc.NdefRecord
+import android.nfc.tech.NfcV
+import com.tangem.common.apdu.StatusWord
+import com.tangem.common.extensions.toByteArray
+import com.tangem.common.extensions.toHexString
+import com.tangem.common.tlv.Tlv
+import com.tangem.common.tlv.TlvMapper
+import com.tangem.common.tlv.TlvTag
+import java.io.ByteArrayOutputStream
+import java.io.IOException
+
+class SlixTagReader() {
+
+    private lateinit var nfcV: NfcV
+
+    fun transceive(nfcV: NfcV): SlixReadResult {
+        this.nfcV = nfcV
+        if (!nfcV.isConnected) {
+            try {
+                nfcV.connect()
+            } catch (e: Exception) {
+                return SlixReadResult.Failure(e)
+            }
+        }
+        return try {
+            runRead()
+        } catch (e: Exception) {
+            nfcV.close()
+            SlixReadResult.Failure(e)
+        }
+    }
+
+    private fun runRead(): SlixReadResult {
+        val ndefMessage = runReadNDEF()
+        val records: Array<NdefRecord> = ndefMessage.records
+        for (record in records) {
+            if (record.toUri() != null && record.toUri().toString() == "vnd.android.nfc://ext/tangem.com:wallet") {
+                val payload = record.payload
+                val status = StatusWord.ProcessCompleted.code.toByteArray()
+                val data = payload.copyOfRange(2, payload.size) + status
+                nfcV.close()
+                return SlixReadResult.Success(data)
+            }
+        }
+        return SlixReadResult.Failure(Exception("No relevant data was found."))
+    }
+
+    private fun runReadNDEF(): NdefMessage {
+        val answerCC = readSingleBlock(0x00)
+
+        if (answerCC.size != 4 || answerCC[0].toInt() != 0xE1 || ((answerCC[1].toInt() and 0xF0) != 0x40)) {
+
+        } else {
+            throw Exception("Failed! Invalid CC read " + answerCC.toHexString())
+        }
+        if ((answerCC[3].toInt() and 0x01) != 0x01) {
+            throw Exception("Multiple block read unsupported!")
+        }
+        val areaSize = 8 * answerCC[2]
+        val blocksCount = areaSize / 4
+
+        val areaBuf = readMultipleBlocks(1, blocksCount)
+
+        val tlvNdef = TlvMapper(Tlv.deserialize(areaBuf, true) ?: listOf())
+
+        return NdefMessage(tlvNdef.map<ByteArray>(TlvTag.CardPublicKey))
+    }
+
+    private fun readSingleBlock(blockNo: Int): ByteArray {
+        return performRead(0x20, blockNo)!!
+    }
+
+    private fun readMultipleBlocks(startBlock: Int, blocksCount: Int): ByteArray {
+        val resultBuf = ByteArrayOutputStream()
+        val maxBlocksAtOnce = 32
+        var blocksRemaining = blocksCount
+        var firstBlockToRead = startBlock
+        while (blocksRemaining > 0) {
+            val blocksToRead = if (blocksRemaining > maxBlocksAtOnce) {
+                maxBlocksAtOnce
+            } else {
+                blocksRemaining
+            }
+            val blocks = performRead(0x23.toByte(), firstBlockToRead, blocksToRead - 1)
+            blocksRemaining -= blocksToRead
+            firstBlockToRead += blocksToRead
+            resultBuf.write(blocks!!)
+        }
+        return resultBuf.toByteArray()
+    }
+
+    private fun performRead(cmd: Byte, p1: Int?, p2: Int? = null, params: ByteArray? = null): ByteArray? {
+        val command: ByteArray
+        val res: ByteArray?
+        val os = ByteArrayOutputStream()
+        os.write(REQ_FLAG.toInt())
+        os.write(cmd.toInt())
+        p1?.let { os.write(p1) }
+        p2?.let { os.write(it) }
+        params?.let { os.write(params, 0, params.size) }
+        command = os.toByteArray()
+        if (!nfcV.isConnected) throw IOException("Connection  lost")
+        res = nfcV.transceive(command)
+        val errorCode = res[0].toInt()
+        if (errorCode != 0) {
+            throw IOException("Error! Code: " + String.format("0x%02x", errorCode))
+        }
+        return res.copyOfRange(1, res.size)
+    }
+
+    companion object {
+        // iso15693 flags
+        private const val REQ_FLAG: Byte = 0x02
+    }
+}
+
+sealed class SlixReadResult {
+    data class Success(val data: ByteArray) : SlixReadResult()
+    data class Failure(val exception: Exception) : SlixReadResult()
+}
\ No newline at end of file
diff --git a/tangem-sdk/src/main/res/drawable/ic_error.xml b/tangem-sdk/src/main/res/drawable/ic_error.xml
new file mode 100644
index 0000000000..d35c5b94ac
--- /dev/null
+++ b/tangem-sdk/src/main/res/drawable/ic_error.xml
@@ -0,0 +1,6 @@
+<vector android:height="100dp" android:tint="#FF9D30"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="100dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12,19m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
+    <path android:fillColor="#FF000000" android:pathData="M10,3h4v12h-4z"/>
+</vector>
diff --git a/tangem-sdk/src/main/res/drawable/ic_nfc.xml b/tangem-sdk/src/main/res/drawable/ic_nfc.xml
new file mode 100644
index 0000000000..c91a1240d6
--- /dev/null
+++ b/tangem-sdk/src/main/res/drawable/ic_nfc.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M10,0C4.48,0 0,4.48 0,10s4.48,10 10,10 10,-4.48 10,-10S15.52,0 10,0zM6.46,12.45l-1.36,-0.62c0.28,-0.61 0.41,-1.24 0.4,-1.86a4.42,4.42 0,0 0,-0.4 -1.8l1.36,-0.63c0.35,0.75 0.53,1.56 0.54,2.4 0.01,0.86 -0.17,1.7 -0.54,2.51zM9.53,14.01l-1.3,-0.74c0.52,-0.92 0.78,-1.98 0.78,-3.15 0,-1.19 -0.27,-2.33 -0.8,-3.4l1.34,-0.67c0.64,1.28 0.96,2.65 0.96,4.07 0,1.43 -0.33,2.74 -0.98,3.89zM12.67,15.33l-1.35,-0.66c0.78,-1.6 1.18,-3.18 1.18,-4.69 0,-1.51 -0.4,-3.07 -1.18,-4.64l1.34,-0.67C13.56,6.45 14,8.23 14,9.98c0,1.74 -0.44,3.54 -1.33,5.35z"
+      android:fillColor="#027AFF"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/tangem-sdk/src/main/res/drawable/pb_circle.xml b/tangem-sdk/src/main/res/drawable/pb_circle.xml
new file mode 100644
index 0000000000..a3e74eb416
--- /dev/null
+++ b/tangem-sdk/src/main/res/drawable/pb_circle.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/secondaryProgress">
+        <shape
+            android:shape="ring"
+            android:thickness="5dp"
+            android:useLevel="true">
+
+            <gradient
+                android:centerColor="#eae9e9"
+                android:endColor="#eae9e9"
+                android:startColor="#eae9e9"
+                android:type="sweep" />
+        </shape>
+    </item>
+
+    <item android:id="@android:id/progress">
+        <rotate
+            android:fromDegrees="270"
+            android:pivotX="50%"
+            android:pivotY="50%"
+            android:toDegrees="270">
+
+            <shape
+                android:shape="ring"
+                android:thickness="5dp"
+                android:useLevel="true">
+
+                <rotate
+                    android:fromDegrees="0"
+                    android:pivotX="50%"
+                    android:pivotY="50%"
+                    android:toDegrees="360" />
+
+                <gradient
+                    android:centerColor="@color/colorAccent"
+                    android:endColor="@color/colorAccent"
+                    android:startColor="@color/colorAccent"
+                    android:type="sweep" />
+
+            </shape>
+        </rotate>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/tangem-sdk/src/main/res/layout/nfc_bottom_sheet.xml b/tangem-sdk/src/main/res/layout/nfc_bottom_sheet.xml
index 496d0453bf..b077eb38ce 100644
--- a/tangem-sdk/src/main/res/layout/nfc_bottom_sheet.xml
+++ b/tangem-sdk/src/main/res/layout/nfc_bottom_sheet.xml
@@ -1,11 +1,61 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
     app:layout_behavior="@string/bottom_sheet_behavior">
 
+    <LinearLayout
+        android:id="@+id/llHeader"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:background="#e2e5e6"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="14dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="14dp"
+            android:src="@drawable/ic_nfc" />
+
+        <TextView
+            android:id="@+id/tvCard"
+            android:layout_width="wrap_content"
+            android:layout_height="48dp"
+            android:backgroundTint="#f3f5f6"
+            android:fontFamily="sans-serif"
+            android:gravity="center"
+            android:letterSpacing="0.02"
+            android:text="@string/header_card"
+            android:textColor="#000000"
+            android:textSize="15sp"
+            android:textStyle="normal"
+            android:visibility="gone"/>
+
+        <TextView
+            android:id="@+id/tvCardId"
+            android:layout_width="wrap_content"
+            android:layout_height="48dp"
+            android:fontFamily="sans-serif-medium"
+            android:gravity="center"
+            android:letterSpacing="0.02"
+            android:paddingStart="5dp"
+            android:paddingEnd="5dp"
+            android:textAllCaps="true"
+            android:textColor="@color/colorAccent"
+            android:textSize="15sp"
+            android:textStyle="normal"
+            tools:text="cb22000000027374"
+            android:visibility="gone"/>
+
+    </LinearLayout>
+
+
     <TextView
         android:id="@+id/tvTaskTitle"
         android:layout_width="wrap_content"
@@ -34,13 +84,20 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:textSize="40dp" />
+            android:fontFamily="sans-serif-light"
+            android:textColor="@color/colorAccent"
+            android:textSize="60dp"
+            android:textStyle="normal" />
 
         <ProgressBar
             android:id="@+id/pbSecurityDelay"
-            android:layout_width="135dp"
-            android:layout_height="135dp"
-            android:layout_gravity="center" />
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="200dp"
+            android:layout_height="200dp"
+            android:layout_gravity="center"
+            android:indeterminate="false"
+            android:progressDrawable="@drawable/pb_circle"
+            android:secondaryProgress="100" />
 
     </FrameLayout>
 
@@ -55,8 +112,47 @@
             android:id="@+id/ivCompletion"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/ic_done_135dp"
-            android:layout_gravity="center"/>
+            android:layout_gravity="center"
+            android:src="@drawable/ic_done_135dp" />
+
+        <ProgressBar
+            android:id="@+id/pbCompletion"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="200dp"
+            android:layout_height="200dp"
+            android:layout_gravity="center"
+            android:indeterminate="false"
+            android:progress="100"
+            android:progressDrawable="@drawable/pb_circle"
+            android:secondaryProgress="100" />
+
+    </FrameLayout>
+
+    <FrameLayout
+        android:id="@+id/flError"
+        android:layout_width="wrap_content"
+        android:layout_height="200dp"
+        android:layout_gravity="center"
+        android:visibility="gone">
+
+        <ImageView
+            android:id="@+id/ivError"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:src="@drawable/ic_error" />
+
+        <ProgressBar
+            android:id="@+id/pbError"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="200dp"
+            android:layout_height="200dp"
+            android:layout_gravity="center"
+            android:indeterminate="false"
+            android:progress="100"
+            android:progressDrawable="@drawable/pb_circle"
+            android:progressTint="#FF9D30"
+            android:secondaryProgress="100" />
 
     </FrameLayout>
 
diff --git a/tangem-sdk/src/main/res/values/strings.xml b/tangem-sdk/src/main/res/values/strings.xml
index 1b84a3024b..aaabeff63d 100644
--- a/tangem-sdk/src/main/res/values/strings.xml
+++ b/tangem-sdk/src/main/res/values/strings.xml
@@ -8,5 +8,6 @@
     <string name="dialog_error">Error</string>
     <string name="dialog_ready_to_scan">Ready to Scan</string>
     <string name="dialog_scan_text">Scan card with your phone as shown above</string>
+    <string name="header_card">Card</string>
 
 </resources>