diff --git a/Jenkinsfile b/Jenkinsfile
index 5415b55c7..ee317926f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,13 +14,14 @@ rm -rf build
 mkdir build
 cd build
 cmake ..
-cmake --build . --target marketmaker-testnet'''
+cmake --build . --target marketmaker-testnet
+cd ../
+docker-compose build'''
       }
     }
     stage('Trade BEER/ETH') {
       steps {
-        sh '''docker-compose build
-docker-compose up -d
+        sh '''docker-compose up -d
 ./start_BEER_OTHER_trade.sh ETH
 timeout 600 grep -q "SWAP completed" <(COMPOSE_HTTP_TIMEOUT=600 docker-compose logs -f clientnode)
 timeout 600 grep -q "SWAP completed" <(COMPOSE_HTTP_TIMEOUT=600 docker-compose logs -f seednode)
@@ -29,11 +30,28 @@ docker-compose down'''
     }
     stage('Trade ETH/BEER') {
       steps {
-        sh '''docker-compose build
-docker-compose up -d
+        sh '''docker-compose up -d
 ./start_BEER_OTHER_trade_inverted.sh ETH
 timeout 600 grep -q "SWAP completed" <(COMPOSE_HTTP_TIMEOUT=600 docker-compose logs -f clientnode)
 timeout 600 grep -q "SWAP completed" <(COMPOSE_HTTP_TIMEOUT=600 docker-compose logs -f seednode)
+docker-compose down'''
+      }
+    }
+    stage('Trade BEER/ETOMIC') {
+      steps {
+        sh '''docker-compose up -d
+./start_BEER_OTHER_trade.sh ETOMIC
+timeout 600 grep -q "SWAP completed" <(COMPOSE_HTTP_TIMEOUT=600 docker-compose logs -f clientnode)
+timeout 600 grep -q "SWAP completed" <(COMPOSE_HTTP_TIMEOUT=600 docker-compose logs -f seednode)
+docker-compose down'''
+      }
+    }
+    stage('Trade ETOMIC/BEER') {
+      steps {
+        sh '''docker-compose up -d
+./start_BEER_OTHER_trade_inverted.sh ETOMIC
+timeout 600 grep -q "SWAP completed" <(COMPOSE_HTTP_TIMEOUT=600 docker-compose logs -f clientnode)
+timeout 600 grep -q "SWAP completed" <(COMPOSE_HTTP_TIMEOUT=600 docker-compose logs -f seednode)
 docker-compose down'''
       }
     }
diff --git a/iguana/exchanges/LP_rpc.c b/iguana/exchanges/LP_rpc.c
index 0e59fc626..9c1bca6c2 100644
--- a/iguana/exchanges/LP_rpc.c
+++ b/iguana/exchanges/LP_rpc.c
@@ -137,6 +137,11 @@ int32_t LP_getheight(int32_t *notarizedp,struct iguana_info *coin)
 
 uint64_t LP_RTsmartbalance(struct iguana_info *coin)
 {
+#ifndef NOTETOMIC
+    if (coin->etomic[0] != 0) {
+        return LP_etomic_get_balance(coin, coin->smartaddr);
+    }
+#endif
     cJSON *array,*item; char buf[512],*retstr; int32_t i,n; uint64_t valuesum,value; bits256 zero;
     valuesum = 0;
     memset(zero.bytes,0,sizeof(zero));