diff --git a/Gopkg.lock b/Gopkg.lock
index 976e6c6bc3..41f16eb504 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -42,7 +42,7 @@
   revision = "d4cc87b860166d00d6b5b9e0d3b3d71d6088d4d4"
 
 [[projects]]
-  branch = "irisnet/refactor"
+  branch = "silei/refactor"
   name = "github.com/cosmos/cosmos-sdk"
   packages = [
     "baseapp",
@@ -91,8 +91,8 @@
     "x/stake/tags",
     "x/stake/types"
   ]
-  revision = "df3b3a9efe7d6ec91cb6cf71905c14f49ed617a4"
-  source = "https://github.com/irisnet/cosmos-sdk.git"
+  revision = "847de58f77b692e1cafaf7c3a80f33faed1bf48f"
+  source = "https://github.com/wukongcheng/cosmos-sdk.git"
 
 [[projects]]
   name = "github.com/davecgh/go-spew"
@@ -202,7 +202,6 @@
     ".",
     "hcl/ast",
     "hcl/parser",
-    "hcl/printer",
     "hcl/scanner",
     "hcl/strconv",
     "hcl/token",
@@ -606,6 +605,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "04a2101507ee1de6681a3727b3701d071195aed8d4a70a7c32f76233a27ad119"
+  inputs-digest = "ecf47ea19c47569bc4bb3b64dcfd89b0ddbce95fe27ceef3ca9e252a3b557846"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/app/app.go b/app/app.go
index e7e6c480c8..2e9764de19 100644
--- a/app/app.go
+++ b/app/app.go
@@ -131,7 +131,7 @@ func NewIrisApp(logger log.Logger, db dbm.DB, traceStore io.Writer, baseAppOptio
 		AddRoute("ibc", []*sdk.KVStoreKey{app.keyIBC, app.keyAccount}, ibc.NewHandler(app.ibcMapper, app.coinKeeper)).
 		AddRoute("stake", []*sdk.KVStoreKey{app.keyStake, app.keyAccount}, stake.NewHandler(app.stakeKeeper)).
 		AddRoute("slashing", []*sdk.KVStoreKey{app.keySlashing, app.keyStake}, slashing.NewHandler(app.slashingKeeper)).
-		AddRoute("gov", []*sdk.KVStoreKey{app.keyGov, app.keyAccount, app.keyStake, app.keyIparams}, gov.NewHandler(app.govKeeper)).
+		AddRoute("gov", []*sdk.KVStoreKey{app.keyGov, app.keyAccount, app.keyStake, app.keyIparams, app.keyParams}, gov.NewHandler(app.govKeeper)).
 		AddRoute("upgrade", []*sdk.KVStoreKey{app.keyUpgrade, app.keyStake}, upgrade.NewHandler(app.upgradeKeeper))
 
 	app.feeManager = bam.NewFeeManager(app.iparamsKeeper.Getter())
diff --git a/app/genesis.go b/app/genesis.go
index daf47deed4..c18c14ce1b 100644
--- a/app/genesis.go
+++ b/app/genesis.go
@@ -170,7 +170,7 @@ func IrisAppGenState(cdc *wire.Codec, appGenTxs []json.RawMessage) (genesisState
 		// create the genesis account, give'm few steaks and a buncha token with there name
 		accAuth := auth.NewBaseAccountWithAddress(genTx.Address)
 		accAuth.Coins = sdk.Coins{
-			{denom, totalTokenAmt},
+			{denom, sdk.NewInt(freeFermionVal)},
 		}
 		acc := NewGenesisAccount(&accAuth)
 		genaccs[i] = acc
diff --git a/baseapp/setters.go b/baseapp/setters.go
index 3f843a9ecd..29e8ce41ad 100644
--- a/baseapp/setters.go
+++ b/baseapp/setters.go
@@ -82,9 +82,9 @@ func (app *BaseApp) SetPubKeyPeerFilter(pf sdk.PeerFilter) {
 	app.pubkeyPeerFilter = pf
 }
 func (app *BaseApp) Router() Router {
-	if app.sealed {
-		panic("Router() on sealed BaseApp")
-	}
+	//if app.sealed {
+	//	panic("Router() on sealed BaseApp")
+	//}
 	return app.router
 }
 func (app *BaseApp) Seal()          { app.sealed = true }