diff --git a/README.md b/README.md
index 08919255..3093e0e6 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ This Dapp allows a user to send thousands of token transfers in a very effecient
 2. Make sure you have an account in MetaMask which has a token balance.
 3. Make sure your MetaMask is pointed to the network that you would like to use.
 4. Make sure your MetaMask account is unlocked.
-5. Go to https://poanetwork.github.io/multisender/#/
+5. Go to https://rstormsf.github.io/multisender/#/
 6. Wait for the full page to load.
 7. Select a token from the dropdown that you would like to send.
 8. Provide either JSON or CSV text in the textarea (see example below).
diff --git a/contracts/contracts/DeprecatedStormSender.sol b/contracts/contracts/DeprecatedStormSender.sol
index f43719c3..28e92b35 100644
--- a/contracts/contracts/DeprecatedStormSender.sol
+++ b/contracts/contracts/DeprecatedStormSender.sol
@@ -1,6 +1,6 @@
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
-pragma solidity 0.4.19;
+// To Use this Dapp: https://rstormsf.github.io/multisender
+pragma solidity 0.4.23;
 
 
 /**
diff --git a/contracts/contracts/EternalStorage.sol b/contracts/contracts/EternalStorage.sol
index 43e81bf3..7c6d09be 100644
--- a/contracts/contracts/EternalStorage.sol
+++ b/contracts/contracts/EternalStorage.sol
@@ -1,6 +1,6 @@
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
-pragma solidity 0.4.19;
+// To Use this Dapp: https://rstormsf.github.io/multisender
+pragma solidity 0.4.23;
 
 
 /**
diff --git a/contracts/contracts/EternalStorageProxyForStormMultisender.sol b/contracts/contracts/EternalStorageProxyForStormMultisender.sol
index 7e3837fa..c8ec62f0 100644
--- a/contracts/contracts/EternalStorageProxyForStormMultisender.sol
+++ b/contracts/contracts/EternalStorageProxyForStormMultisender.sol
@@ -1,6 +1,6 @@
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
-pragma solidity 0.4.19;
+// To Use this Dapp: https://rstormsf.github.io/multisender
+pragma solidity 0.4.23;
 
 import "./EternalStorage.sol";
 import "./OwnedUpgradeabilityProxy.sol";
diff --git a/contracts/contracts/Migrations.sol b/contracts/contracts/Migrations.sol
index 52c6d26d..2d85fdfe 100644
--- a/contracts/contracts/Migrations.sol
+++ b/contracts/contracts/Migrations.sol
@@ -1,5 +1,5 @@
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
+// To Use this Dapp: https://rstormsf.github.io/multisender
 pragma solidity ^0.4.17;
 
 contract Migrations {
diff --git a/contracts/contracts/OwnedUpgradeabilityProxy.sol b/contracts/contracts/OwnedUpgradeabilityProxy.sol
index 175ef362..4b03727c 100644
--- a/contracts/contracts/OwnedUpgradeabilityProxy.sol
+++ b/contracts/contracts/OwnedUpgradeabilityProxy.sol
@@ -1,6 +1,6 @@
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
-pragma solidity 0.4.19;
+// To Use this Dapp: https://rstormsf.github.io/multisender
+pragma solidity 0.4.23;
 
 import "./UpgradeabilityProxy.sol";
 import "./UpgradeabilityOwnerStorage.sol";
diff --git a/contracts/contracts/OwnedUpgradeabilityStorage.sol b/contracts/contracts/OwnedUpgradeabilityStorage.sol
index ca42c4b3..105d741d 100644
--- a/contracts/contracts/OwnedUpgradeabilityStorage.sol
+++ b/contracts/contracts/OwnedUpgradeabilityStorage.sol
@@ -1,6 +1,6 @@
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
-pragma solidity 0.4.19;
+// To Use this Dapp: https://rstormsf.github.io/multisender
+pragma solidity 0.4.23;
 
 import "./EternalStorage.sol";
 import "./UpgradeabilityStorage.sol";
diff --git a/contracts/contracts/Proxy.sol b/contracts/contracts/Proxy.sol
index f0ad9c62..013f6af1 100644
--- a/contracts/contracts/Proxy.sol
+++ b/contracts/contracts/Proxy.sol
@@ -1,6 +1,6 @@
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
-pragma solidity 0.4.19;
+// To Use this Dapp: https://rstormsf.github.io/multisender
+pragma solidity 0.4.23;
 
 
 /**
diff --git a/contracts/contracts/SafeMath.sol b/contracts/contracts/SafeMath.sol
index c2dff728..1c81d4a0 100644
--- a/contracts/contracts/SafeMath.sol
+++ b/contracts/contracts/SafeMath.sol
@@ -1,6 +1,6 @@
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
-pragma solidity 0.4.19;
+// To Use this Dapp: https://rstormsf.github.io/multisender
+pragma solidity 0.4.23;
 
 
 /**
diff --git a/contracts/contracts/UpgradeabilityOwnerStorage.sol b/contracts/contracts/UpgradeabilityOwnerStorage.sol
index bf8442b0..f2c2600f 100644
--- a/contracts/contracts/UpgradeabilityOwnerStorage.sol
+++ b/contracts/contracts/UpgradeabilityOwnerStorage.sol
@@ -1,6 +1,6 @@
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
-pragma solidity 0.4.19;
+// To Use this Dapp: https://rstormsf.github.io/multisender
+pragma solidity 0.4.23;
 
 
 /**
diff --git a/contracts/contracts/UpgradeabilityProxy.sol b/contracts/contracts/UpgradeabilityProxy.sol
index 0af68009..418fb162 100644
--- a/contracts/contracts/UpgradeabilityProxy.sol
+++ b/contracts/contracts/UpgradeabilityProxy.sol
@@ -1,6 +1,6 @@
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
-pragma solidity 0.4.19;
+// To Use this Dapp: https://rstormsf.github.io/multisender
+pragma solidity 0.4.23;
 
 import "./Proxy.sol";
 import "./UpgradeabilityStorage.sol";
diff --git a/contracts/contracts/UpgradeabilityStorage.sol b/contracts/contracts/UpgradeabilityStorage.sol
index df6f3d9d..b9fb5b29 100644
--- a/contracts/contracts/UpgradeabilityStorage.sol
+++ b/contracts/contracts/UpgradeabilityStorage.sol
@@ -1,6 +1,6 @@
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
-pragma solidity 0.4.19;
+// To Use this Dapp: https://rstormsf.github.io/multisender
+pragma solidity 0.4.23;
 
 
 /**
diff --git a/contracts/contracts/multisender/Claimable.sol b/contracts/contracts/multisender/Claimable.sol
index 2577c322..63801664 100644
--- a/contracts/contracts/multisender/Claimable.sol
+++ b/contracts/contracts/multisender/Claimable.sol
@@ -1,6 +1,6 @@
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
-pragma solidity 0.4.19;
+// To Use this Dapp: https://rstormsf.github.io/multisender
+pragma solidity 0.4.23;
 
 import "./Ownable.sol";
 import "../EternalStorage.sol";
diff --git a/contracts/contracts/multisender/Ownable.sol b/contracts/contracts/multisender/Ownable.sol
index d28d796f..305a6c38 100644
--- a/contracts/contracts/multisender/Ownable.sol
+++ b/contracts/contracts/multisender/Ownable.sol
@@ -1,6 +1,6 @@
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
-pragma solidity 0.4.19;
+// To Use this Dapp: https://rstormsf.github.io/multisender
+pragma solidity 0.4.23;
 
 import "../EternalStorage.sol";
 
diff --git a/contracts/contracts/multisender/UpgradebleStormSender.sol b/contracts/contracts/multisender/UpgradebleStormSender.sol
index f398b31d..37180c91 100644
--- a/contracts/contracts/multisender/UpgradebleStormSender.sol
+++ b/contracts/contracts/multisender/UpgradebleStormSender.sol
@@ -1,6 +1,6 @@
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
-pragma solidity 0.4.19;
+// To Use this Dapp: https://rstormsf.github.io/multisender
+pragma solidity 0.4.23;
 
 import "../OwnedUpgradeabilityStorage.sol";
 import "./Claimable.sol";
@@ -100,16 +100,36 @@ contract UpgradebleStormSender is OwnedUpgradeabilityStorage, Claimable {
     }
 
     function multisendToken(address token, address[] _contributors, uint256[] _balances) public hasFee payable {
-        uint256 total = 0;
+        if (token == 0x000000000000000000000000000000000000bEEF){
+            multisendEther(_contributors, _balances);
+        } else {
+            uint256 total = 0;
+            require(_contributors.length <= arrayLimit());
+            ERC20 erc20token = ERC20(token);
+            uint8 i = 0;
+            for (i; i < _contributors.length; i++) {
+                erc20token.transferFrom(msg.sender, _contributors[i], _balances[i]);
+                total += _balances[i];
+            }
+            setTxCount(msg.sender, txCount(msg.sender).add(1));
+            Multisended(total, token);
+        }
+    }
+
+    function multisendEther(address[] _contributors, uint256[] _balances) public payable {
+        uint256 total = msg.value;
+        uint256 fee = currentFee(msg.sender);
+        require(total >= fee);
         require(_contributors.length <= arrayLimit());
-        ERC20 erc20token = ERC20(token);
-        uint8 i = 0;
+        total = total.sub(fee);
+        uint256 i = 0;
         for (i; i < _contributors.length; i++) {
-            erc20token.transferFrom(msg.sender, _contributors[i], _balances[i]);
-            total += _balances[i];
+            require(total >= _balances[i]);
+            total = total.sub(_balances[i]);
+            _contributors[i].transfer(_balances[i]);
         }
         setTxCount(msg.sender, txCount(msg.sender).add(1));
-        Multisended(total, token);
+        Multisended(msg.value, 0x000000000000000000000000000000000000bEEF);
     }
 
     function claimTokens(address _token) public onlyOwner {
diff --git a/contracts/flats/EternalStorageProxyForStormMultisender_flat.sol b/contracts/flats/EternalStorageProxyForStormMultisender_flat.sol
index 4135cc0b..08932d82 100644
--- a/contracts/flats/EternalStorageProxyForStormMultisender_flat.sol
+++ b/contracts/flats/EternalStorageProxyForStormMultisender_flat.sol
@@ -2,7 +2,7 @@
 // File: contracts/EternalStorage.sol
 
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
+// To Use this Dapp: https://rstormsf.github.io/multisender
 pragma solidity 0.4.20;
 
 
@@ -24,7 +24,7 @@ contract EternalStorage {
 // File: contracts/UpgradeabilityOwnerStorage.sol
 
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
+// To Use this Dapp: https://rstormsf.github.io/multisender
 pragma solidity 0.4.20;
 
 
@@ -56,7 +56,7 @@ contract UpgradeabilityOwnerStorage {
 // File: contracts/Proxy.sol
 
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
+// To Use this Dapp: https://rstormsf.github.io/multisender
 pragma solidity 0.4.20;
 
 
@@ -98,7 +98,7 @@ contract Proxy {
 // File: contracts/UpgradeabilityStorage.sol
 
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
+// To Use this Dapp: https://rstormsf.github.io/multisender
 pragma solidity 0.4.20;
 
 
@@ -133,7 +133,7 @@ contract UpgradeabilityStorage {
 // File: contracts/UpgradeabilityProxy.sol
 
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
+// To Use this Dapp: https://rstormsf.github.io/multisender
 pragma solidity 0.4.20;
 
 
@@ -167,7 +167,7 @@ contract UpgradeabilityProxy is Proxy, UpgradeabilityStorage {
 // File: contracts/OwnedUpgradeabilityProxy.sol
 
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
+// To Use this Dapp: https://rstormsf.github.io/multisender
 pragma solidity 0.4.20;
 
 
@@ -244,7 +244,7 @@ contract OwnedUpgradeabilityProxy is UpgradeabilityOwnerStorage, UpgradeabilityP
 // File: contracts/EternalStorageProxyForStormMultisender.sol
 
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
+// To Use this Dapp: https://rstormsf.github.io/multisender
 pragma solidity 0.4.20;
 
 
diff --git a/contracts/flats/UpgradebleStormSender_flat.sol b/contracts/flats/UpgradebleStormSender_flat.sol
index 0c3385c5..378fe712 100644
--- a/contracts/flats/UpgradebleStormSender_flat.sol
+++ b/contracts/flats/UpgradebleStormSender_flat.sol
@@ -2,8 +2,8 @@
 // File: contracts/EternalStorage.sol
 
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
-pragma solidity 0.4.20;
+// To Use this Dapp: https://rstormsf.github.io/multisender
+pragma solidity 0.4.24;
 
 
 /**
@@ -24,8 +24,7 @@ contract EternalStorage {
 // File: contracts/UpgradeabilityOwnerStorage.sol
 
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
-pragma solidity 0.4.20;
+// To Use this Dapp: https://rstormsf.github.io/multisender
 
 
 /**
@@ -56,8 +55,7 @@ contract UpgradeabilityOwnerStorage {
 // File: contracts/UpgradeabilityStorage.sol
 
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
-pragma solidity 0.4.20;
+// To Use this Dapp: https://rstormsf.github.io/multisender
 
 
 /**
@@ -91,8 +89,7 @@ contract UpgradeabilityStorage {
 // File: contracts/OwnedUpgradeabilityStorage.sol
 
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
-pragma solidity 0.4.20;
+// To Use this Dapp: https://rstormsf.github.io/multisender
 
 
 
@@ -108,8 +105,7 @@ contract OwnedUpgradeabilityStorage is UpgradeabilityOwnerStorage, Upgradeabilit
 // File: contracts/SafeMath.sol
 
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
-pragma solidity 0.4.20;
+// To Use this Dapp: https://rstormsf.github.io/multisender
 
 
 /**
@@ -161,8 +157,7 @@ library SafeMath {
 // File: contracts/multisender/Ownable.sol
 
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
-pragma solidity 0.4.20;
+// To Use this Dapp: https://rstormsf.github.io/multisender
 
 
 
@@ -207,7 +202,7 @@ contract Ownable is EternalStorage {
     * @dev Sets a new owner address
     */
     function setOwner(address newOwner) internal {
-        OwnershipTransferred(owner(), newOwner);
+        emit OwnershipTransferred(owner(), newOwner);
         addressStorage[keccak256("owner")] = newOwner;
     }
 }
@@ -215,8 +210,7 @@ contract Ownable is EternalStorage {
 // File: contracts/multisender/Claimable.sol
 
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
-pragma solidity 0.4.20;
+// To Use this Dapp: https://rstormsf.github.io/multisender
 
 
 
@@ -252,7 +246,7 @@ contract Claimable is EternalStorage, Ownable {
     * @dev Allows the pendingOwner address to finalize the transfer.
     */
     function claimOwnership() public onlyPendingOwner {
-        OwnershipTransferred(owner(), pendingOwner());
+        emit OwnershipTransferred(owner(), pendingOwner());
         addressStorage[keccak256("owner")] = addressStorage[keccak256("pendingOwner")];
         addressStorage[keccak256("pendingOwner")] = address(0);
     }
@@ -261,8 +255,7 @@ contract Claimable is EternalStorage, Ownable {
 // File: contracts/multisender/UpgradebleStormSender.sol
 
 // Roman Storm Multi Sender
-// To Use this Dapp: https://poanetwork.github.io/multisender
-pragma solidity 0.4.20;
+// To Use this Dapp: https://rstormsf.github.io/multisender
 
 
 
@@ -317,11 +310,11 @@ contract UpgradebleStormSender is OwnedUpgradeabilityStorage, Claimable {
     }
  
     function txCount(address customer) public view returns(uint256) {
-        return uintStorage[keccak256("txCount", customer)];
+        return uintStorage[keccak256(abi.encodePacked("txCount", customer))];
     }
 
     function arrayLimit() public view returns(uint256) {
-        return uintStorage[keccak256("arrayLimit")];
+        return uintStorage[keccak256(abi.encodePacked("arrayLimit"))];
     }
 
     function setArrayLimit(uint256 _newLimit) public onlyOwner {
@@ -361,31 +354,51 @@ contract UpgradebleStormSender is OwnedUpgradeabilityStorage, Claimable {
     }
 
     function multisendToken(address token, address[] _contributors, uint256[] _balances) public hasFee payable {
-        uint256 total = 0;
+        if (token == 0x000000000000000000000000000000000000bEEF){
+            multisendEther(_contributors, _balances);
+        } else {
+            uint256 total = 0;
+            require(_contributors.length <= arrayLimit());
+            ERC20 erc20token = ERC20(token);
+            uint8 i = 0;
+            for (i; i < _contributors.length; i++) {
+                erc20token.transferFrom(msg.sender, _contributors[i], _balances[i]);
+                total += _balances[i];
+            }
+            setTxCount(msg.sender, txCount(msg.sender).add(1));
+            emit Multisended(total, token);
+        }
+    }
+
+    function multisendEther(address[] _contributors, uint256[] _balances) public payable {
+        uint256 total = msg.value;
+        uint256 userfee = currentFee(msg.sender);
+        require(total >= userfee);
         require(_contributors.length <= arrayLimit());
-        ERC20 erc20token = ERC20(token);
-        uint8 i = 0;
+        total = total.sub(userfee);
+        uint256 i = 0;
         for (i; i < _contributors.length; i++) {
-            erc20token.transferFrom(msg.sender, _contributors[i], _balances[i]);
-            total += _balances[i];
+            require(total >= _balances[i]);
+            total = total.sub(_balances[i]);
+            _contributors[i].transfer(_balances[i]);
         }
         setTxCount(msg.sender, txCount(msg.sender).add(1));
-        Multisended(total, token);
+        emit Multisended(msg.value, 0x000000000000000000000000000000000000bEEF);
     }
 
     function claimTokens(address _token) public onlyOwner {
         if (_token == 0x0) {
-            owner().transfer(this.balance);
+            owner().transfer(address(this).balance);
             return;
         }
         ERC20 erc20token = ERC20(_token);
         uint256 balance = erc20token.balanceOf(this);
         erc20token.transfer(owner(), balance);
-        ClaimedTokens(_token, owner(), balance);
+        emit ClaimedTokens(_token, owner(), balance);
     }
     
     function setTxCount(address customer, uint256 _txCount) private {
-        uintStorage[keccak256("txCount", customer)] = _txCount;
+        uintStorage[keccak256(abi.encodePacked("txCount", customer))] = _txCount;
     }
 
 }
diff --git a/contracts/package-lock.json b/contracts/package-lock.json
index 55821fc8..83fa8c36 100644
--- a/contracts/package-lock.json
+++ b/contracts/package-lock.json
@@ -694,9 +694,9 @@
       "dev": true
     },
     "solc": {
-      "version": "0.4.19",
-      "resolved": "https://registry.npmjs.org/solc/-/solc-0.4.19.tgz",
-      "integrity": "sha512-hvi/vi9rQcB73poRLoLRfQIYKwmdhrNbZlOOFCGd5v58gEsYEUr3+oHPSXhyk4CFNchWC2ojpMYrHDJNm0h4jQ==",
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/solc/-/solc-0.4.23.tgz",
+      "integrity": "sha512-AT7anLHY6uIRg2It6N0UlCHeZ7YeecIkUhnlirrCgCPCUevtnoN48BxvgigN/4jJTRljv5oFhAJtI6gvHzT5DQ==",
       "requires": {
         "fs-extra": "0.30.0",
         "memorystream": "0.3.1",
@@ -863,13 +863,13 @@
       "dev": true
     },
     "truffle": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/truffle/-/truffle-4.0.6.tgz",
-      "integrity": "sha512-E4u1dZr2IGY4liulO/nGMtavx4jVLXIJp48lxFq54N+gMRGhmBQp5kf1etA3bYhHVtO9IO76qRiHMMVuId7cRg==",
+      "version": "4.1.7",
+      "resolved": "https://registry.npmjs.org/truffle/-/truffle-4.1.7.tgz",
+      "integrity": "sha512-fe6BIcD9xo6iIJvV1m6ZhOk56kmB8k38kdoWOKYnPPw7ZUUSupgojeTb2K5e+4qIpIHvEvmET4yLUjSGR+hvwA==",
       "requires": {
         "mocha": "3.5.3",
         "original-require": "1.0.1",
-        "solc": "0.4.19"
+        "solc": "0.4.23"
       }
     },
     "truffle-blockchain-utils": {
diff --git a/contracts/package.json b/contracts/package.json
index 91a1bdbf..38c6f80a 100644
--- a/contracts/package.json
+++ b/contracts/package.json
@@ -9,7 +9,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "truffle": "^4.0.6"
+    "truffle": "^4.1.7"
   },
   "devDependencies": {
     "truffle-flattener": "^1.2.3"
diff --git a/package.json b/package.json
index 7cdec696..29e2a14a 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "multi-sender-app",
   "version": "0.1.0",
   "license": "GPL3",
-  "homepage": "https://poanetwork.github.io/multisender",
+  "homepage": "https://rstormsf.github.io/multisender",
   "dependencies": {
     "bignumber.js": "^6.0.0",
     "csvtojson": "^1.1.9",
@@ -36,6 +36,6 @@
     "test": "react-app-rewired test --env=jsdom",
     "eject": "react-app-rewired eject",
     "predeploy": "npm run build",
-    "deploy": "gh-pages -d build -o origin"
+    "deploy": "gh-pages -d build -o rstorm"
   }
 }
diff --git a/public/index.html b/public/index.html
index e4ab253c..abcb6354 100644
--- a/public/index.html
+++ b/public/index.html
@@ -6,9 +6,10 @@
     <meta name="theme-color" content="#000000">
     <meta property="og:title" content="Token MultiSender" />
     <meta property="og:description" content="Save on tx fees with ERC20 MultiSender" />
-    <meta property="og:url" content="https://poanetwork.github.io/multisender" />
+    <meta property="og:url" content="https://rstormsf.github.io/multisender" />
     <meta property="og:type" content="website" />
-    
+    
+
     <!--
       manifest.json provides metadata used when your web app is added to the
       homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
diff --git a/src/App.js b/src/App.js
index ac3e21a5..74e29d70 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import { Header, FirstStep, SecondStep, ThirdStep, FourthStep, FifthStep } from './components';
+import { Header, FirstStep, SecondStep, ThirdStep, FourthStep, FifthStep, Retry } from './components';
 import { Route } from 'react-router-dom';
 import './assets/stylesheets/application.css';
 
@@ -13,6 +13,7 @@ export class App extends React.Component {
         <Route exact path="/3" component={ThirdStep}/>
         <Route exact path="/4" component={FourthStep}/>
         <Route exact path="/5" component={FifthStep}/>
+        {/* <Route exact path="/retry" component={Retry}/> */}
       </div>
     );
   }
diff --git a/src/abis/StormMultisender.json b/src/abis/StormMultisender.json
index a4fedd4d..fbe8d533 100644
--- a/src/abis/StormMultisender.json
+++ b/src/abis/StormMultisender.json
@@ -1 +1,379 @@
-[{"constant":false,"inputs":[{"name":"token","type":"address"},{"name":"_contributors","type":"address[]"},{"name":"_balances","type":"uint256[]"}],"name":"multisendToken","outputs":[],"payable":true,"stateMutability":"payable","type":"function"},{"constant":true,"inputs":[],"name":"initialized","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_newStep","type":"uint256"}],"name":"setDiscountStep","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[],"name":"claimOwnership","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"version","outputs":[{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"_customer","type":"address"}],"name":"currentFee","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"implementation","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_newStep","type":"uint256"}],"name":"setFee","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"upgradeabilityOwner","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"arrayLimit","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"customer","type":"address"}],"name":"txCount","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_owner","type":"address"}],"name":"initialize","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"fee","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_token","type":"address"}],"name":"claimTokens","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"pendingOwner","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"discountStep","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_newLimit","type":"uint256"}],"name":"setArrayLimit","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"_customer","type":"address"}],"name":"discountRate","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"newOwner","type":"address"}],"name":"transferOwnership","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"payable":true,"stateMutability":"payable","type":"fallback"},{"anonymous":false,"inputs":[{"indexed":false,"name":"total","type":"uint256"},{"indexed":false,"name":"tokenAddress","type":"address"}],"name":"Multisended","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"token","type":"address"},{"indexed":false,"name":"owner","type":"address"},{"indexed":false,"name":"balance","type":"uint256"}],"name":"ClaimedTokens","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"previousOwner","type":"address"},{"indexed":false,"name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"}]
\ No newline at end of file
+[
+  {
+    "constant": false,
+    "inputs": [],
+    "name": "claimOwnership",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "version",
+    "outputs": [
+      {
+        "name": "",
+        "type": "string"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "implementation",
+    "outputs": [
+      {
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "upgradeabilityOwner",
+    "outputs": [
+      {
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "owner",
+    "outputs": [
+      {
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "pendingOwner",
+    "outputs": [
+      {
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "newOwner",
+        "type": "address"
+      }
+    ],
+    "name": "transferOwnership",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "payable": true,
+    "stateMutability": "payable",
+    "type": "fallback"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "name": "total",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "name": "tokenAddress",
+        "type": "address"
+      }
+    ],
+    "name": "Multisended",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "name": "token",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "name": "owner",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "name": "balance",
+        "type": "uint256"
+      }
+    ],
+    "name": "ClaimedTokens",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "name": "previousOwner",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "name": "newOwner",
+        "type": "address"
+      }
+    ],
+    "name": "OwnershipTransferred",
+    "type": "event"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "_owner",
+        "type": "address"
+      }
+    ],
+    "name": "initialize",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "initialized",
+    "outputs": [
+      {
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [
+      {
+        "name": "customer",
+        "type": "address"
+      }
+    ],
+    "name": "txCount",
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "arrayLimit",
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "_newLimit",
+        "type": "uint256"
+      }
+    ],
+    "name": "setArrayLimit",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "discountStep",
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "_newStep",
+        "type": "uint256"
+      }
+    ],
+    "name": "setDiscountStep",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "fee",
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [
+      {
+        "name": "_customer",
+        "type": "address"
+      }
+    ],
+    "name": "currentFee",
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "_newStep",
+        "type": "uint256"
+      }
+    ],
+    "name": "setFee",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [
+      {
+        "name": "_customer",
+        "type": "address"
+      }
+    ],
+    "name": "discountRate",
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "token",
+        "type": "address"
+      },
+      {
+        "name": "_contributors",
+        "type": "address[]"
+      },
+      {
+        "name": "_balances",
+        "type": "uint256[]"
+      }
+    ],
+    "name": "multisendToken",
+    "outputs": [],
+    "payable": true,
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "_contributors",
+        "type": "address[]"
+      },
+      {
+        "name": "_balances",
+        "type": "uint256[]"
+      }
+    ],
+    "name": "multisendEther",
+    "outputs": [],
+    "payable": true,
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "_token",
+        "type": "address"
+      }
+    ],
+    "name": "claimTokens",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  }
+]
\ No newline at end of file
diff --git a/src/components/4.js b/src/components/4.js
index 913fa55f..d225ab0f 100644
--- a/src/components/4.js
+++ b/src/components/4.js
@@ -36,6 +36,7 @@ export class FourthStep extends React.Component {
   constructor(props){
     super(props);
     this.txStore = props.UiStore.txStore;
+    this.tokenStore = props.UiStore.tokenStore;
     this.totalNumberTx = props.UiStore.tokenStore.totalNumberTx;
     this.state = {
       txCount: Number(this.totalNumberTx)
diff --git a/src/components/Header.js b/src/components/Header.js
index 2e213dd9..d65ee8ea 100644
--- a/src/components/Header.js
+++ b/src/components/Header.js
@@ -6,7 +6,7 @@ export const Header = () => (
     <div className="container">
       <a href="#" className="header-logo"></a>
       <form className="form form_header">
-      
+        {/* <Link className="button" to='/retry'>Retry Failed Transaction</Link> */}
         <label htmlFor="network" className="label">MultiSender Address: {process.env.REACT_APP_PROXY_MULTISENDER}</label>
         {/* <select id="network" className="select">
           <option value="">YourTokens</option>
diff --git a/src/components/Retry.js b/src/components/Retry.js
new file mode 100644
index 00000000..6cb4cfa1
--- /dev/null
+++ b/src/components/Retry.js
@@ -0,0 +1,77 @@
+import React from 'react';
+import { inject, observer } from "mobx-react";
+import swal from 'sweetalert';
+import { Link } from 'react-router-dom';
+import generateElement from '../generateElement'
+
+@inject("UiStore")
+@observer
+export class Retry extends React.Component {
+  constructor(props) {
+    super(props)
+    this.onTxInput = this.onTxInput.bind(this)
+    this.txStore = props.UiStore.txStore;
+    
+    this.state = {
+      txHash: ''
+    }
+  }
+  
+  onTxInput(e){
+    const txHash = e.target.value;
+    setTimeout(async () => {
+      if(txHash.length === 66){
+        // https://kovan.etherscan.io/tx/0x234cb7950c9239ce64033647e14b8fdd915106cad24c8ae57b0eb9052e8ec79a
+        const txdata = await this.txStore.getTxReceipt(txHash);
+        console.log(txdata)
+        this.setState({txHash})
+      } else {
+        swal({
+          content: generateElement(`Tx Hash is not valid`),
+          icon: "error",
+        })
+      }
+
+    }, 750)
+  }
+  render () {
+    return (
+      <div className="container container_bg container_opacity">
+        <div className="content">
+          <div className="table">
+            <label htmlFor="txhash" className="label">Transaction Hash</label>
+            <input onChange={this.onTxInput} type="text" className="input" id="txhash"/>
+            <div className="table-tr table-tr_title">
+              <div className="table-td">Token Name</div>
+              <div className="table-td">Address</div>
+              <div className="table-td">Amount</div>
+            </div>
+            <div className="table-tr">
+              <div className="table-td">
+                <p>Name 1</p>
+              </div>
+              <div className="table-td">
+                <p className="break-all">0xc6300135a8fcd43123bb486ff06831b5345d0971</p>
+              </div>
+              <div className="table-td">
+                <p>2.5672 ETH</p>
+              </div>
+            </div>
+            <div className="table-tr">
+              <div className="table-td">
+                <p>Name 2</p>
+              </div>
+              <div className="table-td">
+                <p className="break-all">0x0a7772cdbeee6dbdfdf944dd3e11d32d6a183bde</p>
+              </div>
+              <div className="table-td">
+                <p>8.009 ETH</p>
+              </div>
+            </div>
+          </div>
+          <Link className="button button_next" to='/'>Back to Home</Link>
+        </div>
+      </div>
+    );
+  }
+}
\ No newline at end of file
diff --git a/src/components/index.js b/src/components/index.js
index f6559a26..ad4fc1fd 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -3,4 +3,5 @@ export { FirstStep } from './1';
 export { SecondStep } from './2';
 export { ThirdStep } from './3';
 export { FourthStep } from './4';
-export { FifthStep } from './5';
\ No newline at end of file
+export { FifthStep } from './5';
+export { Retry } from './Retry';
diff --git a/src/getWeb3.js b/src/getWeb3.js
index c7bfa912..e428ddb3 100644
--- a/src/getWeb3.js
+++ b/src/getWeb3.js
@@ -69,7 +69,7 @@ let getWeb3 = () => {
       } else {
         // Fallback to localhost if no web3 injection.
         const errorMsg = `Metamask is not installed. Please go to
-        <a target="_blank" href="https://metamask.io">Metamask website</a> and return to this page after you installed it`
+        https://metamask.io and return to this page after you installed it`
         reject({message: errorMsg})
         console.log('No web3 instance injected, using Local web3.');
         console.error('Metamask not found'); 
diff --git a/src/stores/tokenStore.js b/src/stores/tokenStore.js
index 46929eca..232b6a96 100644
--- a/src/stores/tokenStore.js
+++ b/src/stores/tokenStore.js
@@ -2,8 +2,6 @@ import { action, observable, computed } from "mobx";
 import ERC20ABI from '../abis/ERC20ABI'
 import StormMultiSenderABI from '../abis/StormMultisender'
 import Web3Utils from 'web3-utils';
-import Web3 from "web3";
-import autosave from './autosave'
 
 const BN = require('bignumber.js');
 function add(a, b) {
@@ -132,15 +130,22 @@ class TokenStore {
   @action
   async setTokenAddress(tokenAddress) {
     await this.web3Store.getWeb3Promise.then(async () => {
-      if(Web3Utils.isAddress(this.web3Store.defaultAccount)){
+      if(Web3Utils.isAddress(this.web3Store.defaultAccount) && tokenAddress !== "0x000000000000000000000000000000000000bEEF"){
         this.tokenAddress = tokenAddress;
-        let decimals = await this.getDecimals(tokenAddress)
+        await this.getDecimals(tokenAddress)
         await this.getBalance()
         await this.getAllowance()
         await this.getCurrentFee()
         this.getTokenSymbol(tokenAddress)
         this.getEthBalance()
         this.getArrayLimit()
+      } else {
+        this.tokenAddress = tokenAddress;
+        await this.getCurrentFee()
+        await this.getEthBalance()
+        this.getArrayLimit()
+        this.decimals = 18;
+        this.defAccTokenBalance = this.ethBalance;
       }
     })
   }
@@ -172,6 +177,9 @@ class TokenStore {
       }
     })
     this.jsonAddresses = newAddresses
+    if(this.tokenAddress === "0x000000000000000000000000000000000000bEEF") {
+      this.allowance = this.totalBalance
+    }
   }
 
   @computed get totalBalanceWithDecimals() {
diff --git a/src/stores/txStore.js b/src/stores/txStore.js
index 587be10f..dc64b274 100644
--- a/src/stores/txStore.js
+++ b/src/stores/txStore.js
@@ -65,8 +65,9 @@ class TxStore {
 
   async _multisend({slice, addPerTx}) {
     const token_address = this.tokenStore.tokenAddress
-    let {addresses_to_send, balances_to_send, proxyMultiSenderAddress, currentFee} =  this.tokenStore;
-    currentFee = Web3Utils.toHex(Web3Utils.toWei(currentFee))
+    let {addresses_to_send, balances_to_send, proxyMultiSenderAddress, currentFee, totalBalance} =  this.tokenStore;
+    console.log(totalBalance, currentFee)
+    let ethValue = token_address === "0x000000000000000000000000000000000000bEEF" ? new BN(currentFee).plus(new BN(totalBalance)) : new BN(currentFee)
     const start = (slice - 1) * addPerTx;
     const end = slice * addPerTx;
     addresses_to_send = addresses_to_send.slice(start, end);
@@ -80,7 +81,7 @@ class TxStore {
       let gas = await web3.eth.estimateGas({
           from: this.web3Store.defaultAccount,
           data: encodedData,
-          value: currentFee,
+          value: Web3Utils.toHex(Web3Utils.toWei(ethValue.toString())),
           to: proxyMultiSenderAddress
       })
       console.log('gas', gas)
@@ -89,7 +90,7 @@ class TxStore {
         from: this.web3Store.defaultAccount,
         gasPrice: this.gasPriceStore.standardInHex,
         gas: Web3Utils.toHex(gas + 150000),
-        value: currentFee
+        value: Web3Utils.toHex(Web3Utils.toWei(ethValue.toString())),
       })
 
       .on('transactionHash', (hash) => {
@@ -98,7 +99,15 @@ class TxStore {
         this.txs.push({status: 'pending', name: `Sending Batch #${this.txs.length} ${this.tokenStore.tokenSymbol}\n
           From ${addresses_to_send[0]} to: ${addresses_to_send[addresses_to_send.length-1]}
         `, hash})
-        this.getTxReceipt(hash)
+        const interval = window.setInterval(async () => {
+          const res = await this.getTxReceipt(hash)
+          if(res && res.blockNumber){
+            window.clearInterval(interval);
+            this.getTxStatus(hash)
+          } else {
+            console.log('not mined yet', hash)
+          }
+        }, 5000)
   
       })
       .on('error', (error) => {
@@ -116,17 +125,13 @@ class TxStore {
   }  
 
   async getTxReceipt(hash){
-    const web3 = this.web3Store.web3;
-    web3.eth.getTransaction(hash, (error, res) => {
-      if(res && res.blockNumber){
-        this.getTxStatus(hash)
-      } else {
-        console.log('not mined yet', hash)
-        setTimeout(() => {
-          this.getTxReceipt(hash)
-        }, 5000)
-      }
-    })
+    try {
+      const web3 = this.web3Store.web3;
+      const res = await web3.eth.getTransaction(hash);
+      return res;
+    } catch(e) {
+      console.error(e);
+    }
   }
 
   async getTxStatus(hash) {
diff --git a/src/stores/web3Store.js b/src/stores/web3Store.js
index 5dfe3220..bb8a7dc2 100644
--- a/src/stores/web3Store.js
+++ b/src/stores/web3Store.js
@@ -25,10 +25,14 @@ class Web3Store {
     window.fetch(`https://${trustApiName}.trustwalletapp.com/tokens?address=${defaultAccount}`).then((res) => {
       return res.json()
     }).then((res) => {
-      const tokens = res.docs.map(({contract}) => {
+      let tokens = res.docs.map(({contract}) => {
         const {address, symbol} = contract;
         return {label: `${symbol} - ${address}`, value: address}
       })
+      tokens.unshift({
+        value: '0x000000000000000000000000000000000000bEEF',
+        label: "ETH - Ethereum Native Currency"
+      })
       this.userTokens = tokens;
       this.loading = false;
     }).catch((e) => {