diff --git a/main.go b/main.go
index b04dfdc..ca2f1ac 100644
--- a/main.go
+++ b/main.go
@@ -1,3 +1,4 @@
+//go:build go1.9
 // +build go1.9
 
 package main
diff --git a/payouts/payer.go b/payouts/payer.go
index 8704e32..5c3e03d 100644
--- a/payouts/payer.go
+++ b/payouts/payer.go
@@ -10,7 +10,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/etclabscore/core-geth/common/hexutil"
 
 	"github.com/yuriy0803/open-etc-pool-friends/rpc"
 	"github.com/yuriy0803/open-etc-pool-friends/storage"
diff --git a/payouts/unlocker.go b/payouts/unlocker.go
index f965247..36dd53c 100644
--- a/payouts/unlocker.go
+++ b/payouts/unlocker.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common/math"
+	"github.com/etclabscore/core-geth/common/math"
 
 	"github.com/yuriy0803/open-etc-pool-friends/rpc"
 	"github.com/yuriy0803/open-etc-pool-friends/storage"
@@ -626,7 +626,7 @@ func getConstReward(era *big.Int) *big.Int {
 	return wr
 }
 
-//etchash
+// etchash
 func getRewardForUncle(blockReward *big.Int) *big.Int {
 	return new(big.Int).Div(blockReward, big32) //return new(big.Int).Div(reward, new(big.Int).SetInt64(32))
 }
@@ -669,10 +669,10 @@ func getConstRewardUbiq(height int64) *big.Int {
 		reward = big.NewInt(4e+18)
 		// Year 4
 	}
-   // If Orion use new MP
-  if headerNumber.Cmp(big.NewInt(1791793)) >= 0 {
-    reward = big.NewInt(15e+17)
-  }
+	// If Orion use new MP
+	if headerNumber.Cmp(big.NewInt(1791793)) >= 0 {
+		reward = big.NewInt(15e+17)
+	}
 
 	return reward
 }
diff --git a/proxy/blocks.go b/proxy/blocks.go
index 936eedd..df99b91 100644
--- a/proxy/blocks.go
+++ b/proxy/blocks.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/etclabscore/core-geth/common"
 	"github.com/yuriy0803/open-etc-pool-friends/rpc"
 	"github.com/yuriy0803/open-etc-pool-friends/util"
 )
diff --git a/proxy/miner.go b/proxy/miner.go
index 3e47a9d..33a87bc 100644
--- a/proxy/miner.go
+++ b/proxy/miner.go
@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/etclabscore/core-geth/common"
 	"github.com/yuriy0803/etchash"
 )
 
diff --git a/rpc/rpc.go b/rpc/rpc.go
index 07ba2db..6ebd6a9 100644
--- a/rpc/rpc.go
+++ b/rpc/rpc.go
@@ -12,7 +12,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/etclabscore/core-geth/common/hexutil"
 
 	"github.com/yuriy0803/open-etc-pool-friends/util"
 )
diff --git a/util/util.go b/util/util.go
index f971bac..8caa41d 100644
--- a/util/util.go
+++ b/util/util.go
@@ -6,9 +6,9 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/common/math"
+	"github.com/etclabscore/core-geth/common"
+	"github.com/etclabscore/core-geth/common/hexutil"
+	"github.com/etclabscore/core-geth/common/math"
 )
 
 var Ether = math.BigPow(10, 18)