diff --git a/Cargo.lock b/Cargo.lock
index fb706d7d97d16..8550c6f769457 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -318,7 +318,7 @@ dependencies = [
  "memchr",
  "num_cpus",
  "once_cell",
- "pin-project-lite 0.2.6",
+ "pin-project-lite 0.2.7",
  "pin-utils",
  "slab",
  "wasm-bindgen-futures",
@@ -365,7 +365,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "memchr",
- "pin-project-lite 0.2.6",
+ "pin-project-lite 0.2.7",
 ]
 
 [[package]]
@@ -378,7 +378,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "memchr",
- "pin-project-lite 0.2.6",
+ "pin-project-lite 0.2.7",
 ]
 
 [[package]]
@@ -695,9 +695,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.6.1"
+version = "3.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe"
+checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631"
 
 [[package]]
 name = "byte-slice-cast"
@@ -1344,9 +1344,9 @@ dependencies = [
 
 [[package]]
 name = "ctor"
-version = "0.1.19"
+version = "0.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8f45d9ad417bcef4817d614a501ab55cdd96a6fdb24f49aab89a54acfd66b19"
+checksum = "5e98e2ad1a782e33928b96fc3948e7c355e5af34ba4de7670fe8bac2a3b2006d"
 dependencies = [
  "quote",
  "syn",
@@ -2262,7 +2262,7 @@ dependencies = [
  "futures-io",
  "memchr",
  "parking",
- "pin-project-lite 0.2.6",
+ "pin-project-lite 0.2.7",
  "waker-fn",
 ]
 
@@ -2329,7 +2329,7 @@ dependencies = [
  "futures-sink",
  "futures-task",
  "memchr",
- "pin-project-lite 0.2.6",
+ "pin-project-lite 0.2.7",
  "pin-utils",
  "proc-macro-hack",
  "proc-macro-nested",
@@ -2342,6 +2342,22 @@ version = "0.3.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
 
+[[package]]
+name = "generate-bags"
+version = "3.0.0"
+dependencies = [
+ "chrono",
+ "frame-election-provider-support",
+ "frame-support",
+ "frame-system",
+ "git2",
+ "node-runtime",
+ "num-format",
+ "pallet-staking",
+ "sp-io",
+ "structopt",
+]
+
 [[package]]
 name = "generic-array"
 version = "0.12.4"
@@ -2532,9 +2548,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.1.18"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
 dependencies = [
  "libc",
 ]
@@ -2612,9 +2628,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7245cd7449cc792608c3c8a9eaf69bd4eabbabf802713748fd739c98b82f0747"
+checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11"
 dependencies = [
  "bytes 1.0.1",
  "fnv",
@@ -2623,13 +2639,13 @@ dependencies = [
 
 [[package]]
 name = "http-body"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60daa14be0e0786db0f03a9e57cb404c9d756eed2b6c62b9ea98ec5743ec75a9"
+checksum = "399c583b2979440c60be0821a6199eca73bc3c8dcd9d070d75ac726e2c6186e5"
 dependencies = [
  "bytes 1.0.1",
  "http",
- "pin-project-lite 0.2.6",
+ "pin-project-lite 0.2.7",
 ]
 
 [[package]]
@@ -2693,8 +2709,8 @@ dependencies = [
  "httparse",
  "httpdate",
  "itoa",
- "pin-project-lite 0.2.6",
- "socket2 0.4.0",
+ "pin-project-lite 0.2.7",
+ "socket2 0.4.1",
  "tokio 1.10.0",
  "tower-service",
  "tracing",
@@ -2838,9 +2854,9 @@ dependencies = [
 
 [[package]]
 name = "instant"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
+checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d"
 dependencies = [
  "cfg-if 1.0.0",
 ]
@@ -3232,9 +3248,9 @@ checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a"
 
 [[package]]
 name = "libc"
-version = "0.2.95"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36"
+checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765"
 
 [[package]]
 name = "libgit2-sys"
@@ -3485,7 +3501,7 @@ dependencies = [
  "log 0.4.14",
  "rand 0.8.4",
  "smallvec 1.6.1",
- "socket2 0.4.0",
+ "socket2 0.4.1",
  "void",
 ]
 
@@ -3658,7 +3674,7 @@ dependencies = [
  "libc",
  "libp2p-core",
  "log 0.4.14",
- "socket2 0.4.0",
+ "socket2 0.4.1",
 ]
 
 [[package]]
@@ -3863,9 +3879,9 @@ dependencies = [
 
 [[package]]
 name = "lock_api"
-version = "0.4.2"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312"
+checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb"
 dependencies = [
  "scopeguard",
 ]
@@ -4116,7 +4132,7 @@ checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16"
 dependencies = [
  "libc",
  "log 0.4.14",
- "miow 0.3.6",
+ "miow 0.3.7",
  "ntapi",
  "winapi 0.3.9",
 ]
@@ -4158,11 +4174,10 @@ dependencies = [
 
 [[package]]
 name = "miow"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897"
+checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21"
 dependencies = [
- "socket2 0.3.19",
  "winapi 0.3.9",
 ]
 
@@ -4642,9 +4657,8 @@ name = "node-runtime-generate-bags"
 version = "3.0.0"
 dependencies = [
  "frame-support",
+ "generate-bags",
  "node-runtime",
- "pallet-bags-list",
- "pallet-staking",
  "sp-io",
  "structopt",
 ]
@@ -4898,9 +4912,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.7.2"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3"
+checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
 dependencies = [
  "parking_lot 0.11.1",
 ]
@@ -5082,16 +5096,12 @@ dependencies = [
 name = "pallet-bags-list"
 version = "4.0.0-dev"
 dependencies = [
- "chrono",
  "frame-benchmarking",
  "frame-election-provider-support",
  "frame-support",
  "frame-system",
- "git2",
  "log 0.4.14",
- "num-format",
  "pallet-balances",
- "pallet-staking",
  "parity-scale-codec",
  "sp-core",
  "sp-io",
@@ -5750,14 +5760,11 @@ dependencies = [
 name = "pallet-staking"
 version = "4.0.0-dev"
 dependencies = [
- "chrono",
  "frame-benchmarking",
  "frame-election-provider-support",
  "frame-support",
  "frame-system",
- "git2",
  "log 0.4.14",
- "num-format",
  "pallet-authorship",
  "pallet-bags-list",
  "pallet-balances",
@@ -6142,7 +6149,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
 dependencies = [
  "instant",
- "lock_api 0.4.2",
+ "lock_api 0.4.4",
  "parking_lot_core 0.8.3",
 ]
 
@@ -6184,7 +6191,7 @@ dependencies = [
  "cfg-if 1.0.0",
  "instant",
  "libc",
- "redox_syscall 0.2.5",
+ "redox_syscall 0.2.10",
  "smallvec 1.6.1",
  "winapi 0.3.9",
 ]
@@ -6352,9 +6359,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905"
+checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443"
 
 [[package]]
 name = "pin-utils"
@@ -7074,9 +7081,9 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
 
 [[package]]
 name = "redox_syscall"
-version = "0.2.5"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9"
+checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
 dependencies = [
  "bitflags",
 ]
@@ -7088,7 +7095,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
 dependencies = [
  "getrandom 0.2.3",
- "redox_syscall 0.2.5",
+ "redox_syscall 0.2.10",
 ]
 
 [[package]]
@@ -8644,9 +8651,9 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.126"
+version = "1.0.127"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03"
+checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8"
 dependencies = [
  "serde_derive",
 ]
@@ -8672,9 +8679,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.126"
+version = "1.0.127"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43"
+checksum = "a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8683,9 +8690,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.64"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79"
+checksum = "336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127"
 dependencies = [
  "itoa",
  "ryu",
@@ -8787,9 +8794,9 @@ dependencies = [
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6"
+checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
 dependencies = [
  "libc",
 ]
@@ -8814,9 +8821,9 @@ dependencies = [
 
 [[package]]
 name = "slab"
-version = "0.4.2"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
+checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590"
 
 [[package]]
 name = "slog"
@@ -8879,9 +8886,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2"
+checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad"
 dependencies = [
  "libc",
  "winapi 0.3.9",
@@ -10066,9 +10073,9 @@ checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2"
 
 [[package]]
 name = "syn"
-version = "1.0.69"
+version = "1.0.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48fe99c6bd8b1cc636890bcc071842de909d902c81ac7dab53ba33c421ab8ffb"
+checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10125,7 +10132,7 @@ dependencies = [
  "cfg-if 1.0.0",
  "libc",
  "rand 0.8.4",
- "redox_syscall 0.2.5",
+ "redox_syscall 0.2.10",
  "remove_dir_all",
  "winapi 0.3.9",
 ]
@@ -10374,7 +10381,7 @@ dependencies = [
  "num_cpus",
  "once_cell",
  "parking_lot 0.11.1",
- "pin-project-lite 0.2.6",
+ "pin-project-lite 0.2.7",
  "signal-hook-registry",
  "tokio-macros 1.3.0",
  "winapi 0.3.9",
@@ -10514,7 +10521,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b2f3f698253f03119ac0102beaa64f67a67e08074d03a22d18784104543727f"
 dependencies = [
  "futures-core",
- "pin-project-lite 0.2.6",
+ "pin-project-lite 0.2.7",
  "tokio 1.10.0",
 ]
 
@@ -10640,7 +10647,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "log 0.4.14",
- "pin-project-lite 0.2.6",
+ "pin-project-lite 0.2.7",
  "tokio 1.10.0",
 ]
 
@@ -10661,12 +10668,12 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
 
 [[package]]
 name = "tracing"
-version = "0.1.25"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01ebdc2bb4498ab1ab5f5b73c5803825e60199229ccba0698170e3be0e7f959f"
+checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d"
 dependencies = [
  "cfg-if 1.0.0",
- "pin-project-lite 0.2.6",
+ "pin-project-lite 0.2.7",
  "tracing-attributes",
  "tracing-core",
 ]
@@ -10684,9 +10691,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.17"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f"
+checksum = "a9ff14f98b1a4b289c6248a023c1c2fa1491062964e9fed67ab29c4e4da4a052"
 dependencies = [
  "lazy_static",
 ]
@@ -10978,9 +10985,9 @@ checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
+checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
 
 [[package]]
 name = "universal-hash"
@@ -11053,11 +11060,12 @@ dependencies = [
 
 [[package]]
 name = "value-bag"
-version = "1.0.0-alpha.6"
+version = "1.0.0-alpha.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b676010e055c99033117c2343b33a40a30b91fecd6c49055ac9cd2d6c305ab1"
+checksum = "dd320e1520f94261153e96f7534476ad869c14022aee1e59af7c778075d840ae"
 dependencies = [
  "ctor",
+ "version_check 0.9.2",
 ]
 
 [[package]]
@@ -11675,9 +11683,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.47"
+version = "0.3.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c40dc691fc48003eba817c38da7113c15698142da971298003cac3ef175680b3"
+checksum = "a905d57e488fec8861446d3393670fb50d27a262344013181c2cdf9fff5481be"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
diff --git a/Cargo.toml b/Cargo.toml
index eb62ff712e465..d2232257d879e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -129,7 +129,6 @@ members = [
 	"frame/utility",
 	"frame/vesting",
 	"frame/bags-list",
-	"frame/bags-list/generate-bags",
 	"primitives/api",
 	"primitives/api/proc-macro",
 	"primitives/api/test",
@@ -201,6 +200,8 @@ members = [
 	"utils/frame/try-runtime/cli",
 	"utils/frame/rpc/support",
 	"utils/frame/rpc/system",
+	"utils/frame/generate-bags",
+	"utils/frame/generate-bags/node-runtime",
 	"utils/prometheus",
 	"utils/wasm-builder",
 ]
diff --git a/client/db/src/bench.rs b/client/db/src/bench.rs
index a4b8f6696ea6a..5f5cbae12749c 100644
--- a/client/db/src/bench.rs
+++ b/client/db/src/bench.rs
@@ -544,7 +544,7 @@ impl<B: BlockT> StateBackend<HashFor<B>> for BenchmarkingState<B> {
 
 				if tracker.writes > 0 {
 					writes += 1;
-					repeat_writes += tracker.reads - 1;
+					repeat_writes += tracker.writes - 1;
 				}
 			}
 		});
diff --git a/frame/bags-list/Cargo.toml b/frame/bags-list/Cargo.toml
index 7f22bd03f7b46..75423a78b6654 100644
--- a/frame/bags-list/Cargo.toml
+++ b/frame/bags-list/Cargo.toml
@@ -35,12 +35,6 @@ sp-core = { version = "4.0.0-dev", path = "../../primitives/core", optional = tr
 sp-io = { version = "4.0.0-dev", path = "../../primitives/io", optional = true, default-features = false }
 sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing", optional = true, default-features = false }
 
-# optional imports for making voter bags lists
-chrono = { version = "0.4.19", optional = true }
-git2 = { version = "0.13.20", default-features = false, optional = true }
-num-format = { version = "0.4.0", optional = true }
-pallet-staking = { version = "4.0.0-dev", path = "../staking", optional = true }
-
 [dev-dependencies]
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core"}
 sp-io = { version = "4.0.0-dev", path = "../../primitives/io"}
@@ -66,11 +60,6 @@ runtime-benchmarks = [
 	"sp-io",
 	"pallet-balances",
 	"sp-tracing",
+  "frame-election-provider-support/runtime-benchmarks",
 ]
-generate-bags = [
-	"chrono",
-	"git2",
-	"num-format",
-	"std",
-	"pallet-staking"
-]
+
diff --git a/frame/bags-list/src/lib.rs b/frame/bags-list/src/lib.rs
index f8b09fb512762..677bd0ee8c956 100644
--- a/frame/bags-list/src/lib.rs
+++ b/frame/bags-list/src/lib.rs
@@ -56,8 +56,6 @@ use sp_std::prelude::*;
 #[cfg(any(feature = "runtime-benchmarks", test))]
 mod benchmarks;
 
-#[cfg(feature = "generate-bags")]
-pub mod generate_bags;
 mod list;
 #[cfg(test)]
 mod mock;
@@ -267,4 +265,26 @@ impl<T: Config> SortedListProvider<T::AccountId> for Pallet<T> {
 	fn clear() {
 		List::<T>::clear()
 	}
+
+	#[cfg(feature = "runtime-benchmarks")]
+	fn weight_update_worst_case(who: &T::AccountId, is_increase: bool) -> VoteWeight {
+		use frame_support::traits::Get as _;
+		let thresholds = T::BagThresholds::get();
+		let node = list::Node::<T>::get(who).unwrap();
+		let current_bag_idx = thresholds
+			.iter()
+			.chain(sp_std::iter::once(&VoteWeight::MAX))
+			.position(|w| w == &node.bag_upper)
+			.unwrap();
+
+		if is_increase {
+			let next_threshold_idx = current_bag_idx + 1;
+			assert!(thresholds.len() > next_threshold_idx);
+			thresholds[next_threshold_idx]
+		} else {
+			assert!(current_bag_idx != 0);
+			let prev_threshold_idx = current_bag_idx - 1;
+			thresholds[prev_threshold_idx]
+		}
+	}
 }
diff --git a/frame/bags-list/src/list/mod.rs b/frame/bags-list/src/list/mod.rs
index c2e42cc48ec3e..11c0f413c593e 100644
--- a/frame/bags-list/src/list/mod.rs
+++ b/frame/bags-list/src/list/mod.rs
@@ -52,7 +52,7 @@ mod tests;
 ///
 /// Note that even if the thresholds list does not have `VoteWeight::MAX` as its final member, this
 /// function behaves as if it does.
-fn notional_bag_for<T: Config>(weight: VoteWeight) -> VoteWeight {
+pub(crate) fn notional_bag_for<T: Config>(weight: VoteWeight) -> VoteWeight {
 	let thresholds = T::BagThresholds::get();
 	let idx = thresholds.partition_point(|&threshold| weight > threshold);
 	thresholds.get(idx).copied().unwrap_or(VoteWeight::MAX)
@@ -586,6 +586,11 @@ impl<T: Config> Bag<T> {
 
 		Ok(())
 	}
+
+	#[cfg(feature = "runtime-benchmarks")]
+	pub(crate) fn contains(&self, id: &T::AccountId) -> bool {
+		self.iter().any(|n| n.id() == id)
+	}
 }
 
 /// A Node is the fundamental element comprising the doubly-linked list described by `Bag`.
@@ -596,7 +601,7 @@ pub struct Node<T: Config> {
 	id: T::AccountId,
 	prev: Option<T::AccountId>,
 	next: Option<T::AccountId>,
-	bag_upper: VoteWeight,
+	pub(crate) bag_upper: VoteWeight,
 }
 
 impl<T: Config> Node<T> {
diff --git a/frame/bags-list/src/list/tests.rs b/frame/bags-list/src/list/tests.rs
index 28d3cb031a59f..49efcca8bf416 100644
--- a/frame/bags-list/src/list/tests.rs
+++ b/frame/bags-list/src/list/tests.rs
@@ -136,8 +136,8 @@ fn migrate_works() {
 					(15, vec![710]), // nodes in range 11 ..= 15 move from bag 20 to bag 15
 					(20, vec![711]),
 					(1000, vec![2, 3, 4]),
-					(10_000, vec![712]), /* nodes in range 1_001 ..= 2_000 move from bag 2_000
-					                      * to bag 10_000 */
+					// nodes in range 1_001 ..= 2_000 move from bag 2_000 to bag 10_000
+					(10_000, vec![712]),
 				]
 			);
 		});
diff --git a/frame/election-provider-support/src/lib.rs b/frame/election-provider-support/src/lib.rs
index c461ae56b9c2b..9eae6fc636a88 100644
--- a/frame/election-provider-support/src/lib.rs
+++ b/frame/election-provider-support/src/lib.rs
@@ -333,6 +333,13 @@ pub trait SortedListProvider<AccountId> {
 	fn clear();
 	/// Sanity check internal state of list. Only meant for debug compilation.
 	fn sanity_check() -> Result<(), &'static str>;
+
+	/// If `who` changes by the returned amount they are guaranteed to have a worst case change
+	/// in their list position.
+	#[cfg(feature = "runtime-benchmarks")]
+	fn weight_update_worst_case(_who: &AccountId, _is_increase: bool) -> VoteWeight {
+		VoteWeight::MAX
+	}
 }
 
 /// Something that can provide the `VoteWeight` of an account. Similar to [`ElectionProvider`] and
diff --git a/frame/session/benchmarking/src/lib.rs b/frame/session/benchmarking/src/lib.rs
index 8b84145c1acfd..349043bdbf991 100644
--- a/frame/session/benchmarking/src/lib.rs
+++ b/frame/session/benchmarking/src/lib.rs
@@ -126,7 +126,7 @@ fn check_membership_proof_setup<T: Config>(
 	pallet_staking::ValidatorCount::<T>::put(n);
 
 	// create validators and set random session keys
-	for (n, who) in create_validators::<T>(n, 1000).unwrap().into_iter().enumerate() {
+	for (n, who) in create_validators::<T>(n, 1000, 0).unwrap().into_iter().enumerate() {
 		use rand::{RngCore, SeedableRng};
 
 		let validator = T::Lookup::lookup(who).unwrap();
diff --git a/frame/staking/Cargo.toml b/frame/staking/Cargo.toml
index 684cd6800a279..18fcd46ecc5f2 100644
--- a/frame/staking/Cargo.toml
+++ b/frame/staking/Cargo.toml
@@ -40,11 +40,6 @@ log = { version = "0.4.14", default-features = false }
 frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
 rand_chacha = { version = "0.2", default-features = false, optional = true }
 
-# Optional imports for making voter bags lists
-chrono = { version = "0.4.19", optional = true }
-git2 = { version = "0.13.20", default-features = false, optional = true }
-num-format = { version = "0.4.0", optional = true }
-
 [dev-dependencies]
 sp-tracing = { version = "4.0.0-dev", path = "../../primitives/tracing" }
 sp-core = { version = "4.0.0-dev", path = "../../primitives/core" }
@@ -52,7 +47,7 @@ sp-npos-elections = { version = "4.0.0-dev", path = "../../primitives/npos-elect
 pallet-balances = { version = "4.0.0-dev", path = "../balances" }
 pallet-timestamp = { version = "4.0.0-dev", path = "../timestamp" }
 pallet-staking-reward-curve = { version = "4.0.0-dev",  path = "../staking/reward-curve" }
-pallet-bags-list = { version = "4.0.0-dev",  path = "../bags-list" }
+pallet-bags-list = { version = "4.0.0-dev", features = ["runtime-benchmarks"], path = "../bags-list" }
 substrate-test-utils = { version = "4.0.0-dev", path = "../../test-utils" }
 frame-benchmarking = { version = "4.0.0-dev", path = "../benchmarking" }
 frame-election-provider-support = { version = "4.0.0-dev", path = "../election-provider-support" }
@@ -81,14 +76,3 @@ runtime-benchmarks = [
 	"rand_chacha",
 ]
 try-runtime = ["frame-support/try-runtime"]
-generate-bags = [
-	"chrono",
-	"git2",
-	"num-format",
-	"pallet-staking-reward-curve",
-	"pallet-balances",
-	"pallet-timestamp",
-	"sp-core",
-	"sp-tracing",
-	"std",
-]
diff --git a/frame/staking/src/benchmarking.rs b/frame/staking/src/benchmarking.rs
index d8eef256fd782..233c628f2f925 100644
--- a/frame/staking/src/benchmarking.rs
+++ b/frame/staking/src/benchmarking.rs
@@ -21,9 +21,10 @@ use super::*;
 use crate::Pallet as Staking;
 use testing_utils::*;
 
+use frame_election_provider_support::{SortedListProvider, VoteWeight};
 use frame_support::{
 	pallet_prelude::*,
-	traits::{Currency, Get, Imbalance},
+	traits::{Currency, CurrencyToVote, Get, Imbalance},
 };
 use sp_runtime::{
 	traits::{StaticLookup, Zero},
@@ -131,6 +132,95 @@ pub fn create_validator_with_nominators<T: Config>(
 	Ok((v_stash, nominators))
 }
 
+struct ListScenario<T: Config> {
+	dest_stash1: T::AccountId,
+	/// Stash that is expected to be moved.
+	origin_stash1: T::AccountId,
+	/// Controller of the Stash that is expected to be moved.
+	origin_controller1: T::AccountId,
+	origin_stash2: T::AccountId,
+	origin_weight_as_vote: VoteWeight,
+	dest_weight_as_vote: VoteWeight,
+	dest_weight: BalanceOf<T>,
+}
+
+impl<T: Config> ListScenario<T> {
+	/// An expensive scenario for bags-list implementation:
+	///
+	/// - the node to be updated (r) is the head of a bag that has at least one other node. The bag
+	///   itself will need to be read and written to update its head. The node pointed to by r.next
+	///   will need to be read and written as it will need to have its prev pointer updated. Note
+	///   that there are two other worst case scenarios for bag removal: 1) the node is a tail and
+	///   2) the node is a middle node with prev and next; all scenarios end up with the same number
+	///   of storage reads and writes.
+	///
+	/// - the destination bag has at least one node, which will need its next pointer updated.
+	///
+	/// NOTE: while this scenario specifically targets a worst case for the bags-list, it should
+	/// also elicit a worst case for other known `SortedListProvider` implementations; although
+	/// this may not be true against unknown `SortedListProvider` implementations.
+	fn new(origin_weight: BalanceOf<T>, is_increase: bool) -> Result<Self, &'static str> {
+		ensure!(!origin_weight.is_zero(), "origin weight must be greater than 0");
+
+		// burn the entire issuance.
+		let i = T::Currency::burn(T::Currency::total_issuance());
+		sp_std::mem::forget(i);
+
+		// create accounts with the origin weight
+
+		let (origin_stash1, origin_controller1) = create_stash_controller_with_balance::<T>(
+			USER_SEED + 2,
+			origin_weight,
+			Default::default(),
+		)?;
+		Staking::<T>::nominate(
+			RawOrigin::Signed(origin_controller1.clone()).into(),
+			// NOTE: these don't really need to be validators.
+			vec![T::Lookup::unlookup(account("random_validator", 0, SEED))],
+		)?;
+
+		let (origin_stash2, origin_controller2) = create_stash_controller_with_balance::<T>(
+			USER_SEED + 3,
+			origin_weight,
+			Default::default(),
+		)?;
+		Staking::<T>::nominate(
+			RawOrigin::Signed(origin_controller2.clone()).into(),
+			vec![T::Lookup::unlookup(account("random_validator", 0, SEED))].clone(),
+		)?;
+
+		// find a destination weight that will trigger the worst case scenario
+		let dest_weight_as_vote =
+			T::SortedListProvider::weight_update_worst_case(&origin_stash1, is_increase);
+
+		let total_issuance = T::Currency::total_issuance();
+
+		let dest_weight =
+			T::CurrencyToVote::to_currency(dest_weight_as_vote as u128, total_issuance);
+
+		// create an account with the worst case destination weight
+		let (dest_stash1, dest_controller1) = create_stash_controller_with_balance::<T>(
+			USER_SEED + 1,
+			dest_weight,
+			Default::default(),
+		)?;
+		Staking::<T>::nominate(
+			RawOrigin::Signed(dest_controller1).into(),
+			vec![T::Lookup::unlookup(account("random_validator", 0, SEED))],
+		)?;
+
+		Ok(ListScenario {
+			dest_stash1,
+			origin_stash1,
+			origin_controller1,
+			origin_stash2,
+			origin_weight_as_vote: T::CurrencyToVote::to_vote(origin_weight, total_issuance),
+			dest_weight_as_vote,
+			dest_weight,
+		})
+	}
+}
+
 const USER_SEED: u32 = 999666;
 
 benchmarks! {
@@ -148,10 +238,24 @@ benchmarks! {
 	}
 
 	bond_extra {
-		let (stash, controller) = create_stash_controller::<T>(USER_SEED, 100, Default::default())?;
-		let max_additional = T::Currency::minimum_balance() * 10u32.into();
-		let ledger = Ledger::<T>::get(&controller).ok_or("ledger not created before")?;
-		let original_bonded: BalanceOf<T> = ledger.active;
+		// clean up any existing state.
+		clear_validators_and_nominators::<T>();
+
+		let origin_weight = MinNominatorBond::<T>::get().max(T::Currency::minimum_balance());
+
+		// setup the worst case list scenario.
+
+		// the weight the nominator will start at.
+		let scenario = ListScenario::<T>::new(origin_weight, true)?;
+
+		let max_additional = scenario.dest_weight.clone() - origin_weight;
+
+		let stash = scenario.origin_stash1.clone();
+		let controller = scenario.origin_controller1.clone();
+		let original_bonded: BalanceOf<T> = Ledger::<T>::get(&controller).map(|l| l.active).ok_or("ledger not created after")?;
+
+		T::Currency::deposit_into_existing(&stash, max_additional).unwrap();
+
 		whitelist_account!(stash);
 	}: _(RawOrigin::Signed(stash), max_additional)
 	verify {
@@ -161,10 +265,25 @@ benchmarks! {
 	}
 
 	unbond {
-		let (_, controller) = create_stash_controller::<T>(USER_SEED, 100, Default::default())?;
-		let amount = T::Currency::minimum_balance() * 10u32.into();
+		use sp_std::convert::TryFrom;
+		// clean up any existing state.
+		clear_validators_and_nominators::<T>();
+
+		// setup the worst case list scenario.
+		let total_issuance = T::Currency::total_issuance();
+		// the weight the nominator will start at. The value used here is expected to be
+		// significantly higher than the first position in a list (e.g. the first bag threshold).
+		let origin_weight = BalanceOf::<T>::try_from(952_994_955_240_703u128)
+			.map_err(|_| "balance expected to be a u128")
+			.unwrap();
+		let scenario = ListScenario::<T>::new(origin_weight, false)?;
+
+		let stash = scenario.origin_stash1.clone();
+		let controller = scenario.origin_controller1.clone();
+		let amount = origin_weight - scenario.dest_weight.clone();
 		let ledger = Ledger::<T>::get(&controller).ok_or("ledger not created before")?;
 		let original_bonded: BalanceOf<T> = ledger.active;
+
 		whitelist_account!(controller);
 	}: _(RawOrigin::Signed(controller.clone()), amount)
 	verify {
@@ -196,26 +315,50 @@ benchmarks! {
 	withdraw_unbonded_kill {
 		// Slashing Spans
 		let s in 0 .. MAX_SPANS;
-		let (stash, controller) = create_stash_controller::<T>(0, 100, Default::default())?;
-		add_slashing_spans::<T>(&stash, s);
-		let amount = T::Currency::minimum_balance() * 10u32.into();
-		Staking::<T>::unbond(RawOrigin::Signed(controller.clone()).into(), amount)?;
+		// clean up any existing state.
+		clear_validators_and_nominators::<T>();
+
+		let origin_weight = MinNominatorBond::<T>::get().max(T::Currency::minimum_balance());
+
+		// setup a worst case list scenario. Note that we don't care about the setup of the
+		// destination position because we are doing a removal from the list but no insert.
+		let scenario = ListScenario::<T>::new(origin_weight, true)?;
+		let controller = scenario.origin_controller1.clone();
+		let stash = scenario.origin_stash1.clone();
+		assert!(T::SortedListProvider::contains(&stash));
+
+		let ed = T::Currency::minimum_balance();
+		let mut ledger = Ledger::<T>::get(&controller).unwrap();
+		ledger.active = ed - One::one();
+		Ledger::<T>::insert(&controller, ledger);
 		CurrentEra::<T>::put(EraIndex::max_value());
-		let ledger = Ledger::<T>::get(&controller).ok_or("ledger not created before")?;
-		let original_total: BalanceOf<T> = ledger.total;
+
 		whitelist_account!(controller);
 	}: withdraw_unbonded(RawOrigin::Signed(controller.clone()), s)
 	verify {
 		assert!(!Ledger::<T>::contains_key(controller));
+		assert!(!T::SortedListProvider::contains(&stash));
 	}
 
 	validate {
-		let (stash, controller) = create_stash_controller::<T>(USER_SEED, 100, Default::default())?;
+		// clean up any existing state.
+		clear_validators_and_nominators::<T>();
+
+		let origin_weight = MinNominatorBond::<T>::get().max(T::Currency::minimum_balance());
+
+		// setup a worst case scenario where the user calling validate was formerly a nominator so
+		// they must be removed from the list.
+		let scenario = ListScenario::<T>::new(origin_weight, true)?;
+		let controller = scenario.origin_controller1.clone();
+		let stash = scenario.origin_stash1.clone();
+		assert!(T::SortedListProvider::contains(&stash));
+
 		let prefs = ValidatorPrefs::default();
 		whitelist_account!(controller);
 	}: _(RawOrigin::Signed(controller), prefs)
 	verify {
-		assert!(Validators::<T>::contains_key(stash));
+		assert!(Validators::<T>::contains_key(&stash));
+		assert!(!T::SortedListProvider::contains(&stash));
 	}
 
 	kick {
@@ -227,7 +370,7 @@ benchmarks! {
 
 		// these are the other validators; there are `T::MAX_NOMINATIONS - 1` of them, so
 		// there are a total of `T::MAX_NOMINATIONS` validators in the system.
-		let rest_of_validators = create_validators::<T>(T::MAX_NOMINATIONS - 1, 100)?;
+		let rest_of_validators = create_validators::<T>(T::MAX_NOMINATIONS - 1, 100, 0)?;
 
 		// this is the validator that will be kicking.
 		let (stash, controller) = create_stash_controller::<T>(
@@ -284,18 +427,49 @@ benchmarks! {
 	// Worst case scenario, T::MAX_NOMINATIONS
 	nominate {
 		let n in 1 .. T::MAX_NOMINATIONS;
-		let (stash, controller) = create_stash_controller::<T>(n + 1, 100, Default::default())?;
-		let validators = create_validators::<T>(n, 100)?;
+
+		// clean up any existing state.
+		clear_validators_and_nominators::<T>();
+
+		let origin_weight = MinNominatorBond::<T>::get().max(T::Currency::minimum_balance());
+
+		// setup a worst case list scenario.
+		let scenario = ListScenario::<T>::new(origin_weight, true)?;
+		let (stash, controller) = create_stash_controller_with_balance::<T>(
+			SEED + T::MAX_NOMINATIONS + 1, // make sure the account does not conflict with others
+			origin_weight,
+			Default::default(),
+		).unwrap();
+
+		assert!(!Nominators::<T>::contains_key(&stash));
+		assert!(!T::SortedListProvider::contains(&stash));
+
+		let validators = create_validators::<T>(n, 100, 0).unwrap();
 		whitelist_account!(controller);
 	}: _(RawOrigin::Signed(controller), validators)
 	verify {
-		assert!(Nominators::<T>::contains_key(stash));
+		assert!(Nominators::<T>::contains_key(&stash));
+		assert!(T::SortedListProvider::contains(&stash))
 	}
 
 	chill {
-		let (_, controller) = create_stash_controller::<T>(USER_SEED, 100, Default::default())?;
+		// clean up any existing state.
+		clear_validators_and_nominators::<T>();
+
+		let origin_weight = MinNominatorBond::<T>::get().max(T::Currency::minimum_balance());
+
+		// setup a worst case list scenario. Note that we don't care about the setup of the
+		// destination position because we are doing a removal from the list but no insert.
+		let scenario = ListScenario::<T>::new(origin_weight, true)?;
+		let controller = scenario.origin_controller1.clone();
+		let stash = scenario.origin_stash1.clone();
+		assert!(T::SortedListProvider::contains(&stash));
+
 		whitelist_account!(controller);
 	}: _(RawOrigin::Signed(controller))
+	verify {
+		assert!(!T::SortedListProvider::contains(&stash));
+	}
 
 	set_payee {
 		let (stash, controller) = create_stash_controller::<T>(USER_SEED, 100, Default::default())?;
@@ -347,11 +521,23 @@ benchmarks! {
 	force_unstake {
 		// Slashing Spans
 		let s in 0 .. MAX_SPANS;
-		let (stash, controller) = create_stash_controller::<T>(0, 100, Default::default())?;
+		// Clean up any existing state.
+		clear_validators_and_nominators::<T>();
+
+		let origin_weight = MinNominatorBond::<T>::get().max(T::Currency::minimum_balance());
+
+		// setup a worst case list scenario. Note that we don't care about the setup of the
+		// destination position because we are doing a removal from the list but no insert.
+		let scenario = ListScenario::<T>::new(origin_weight, true)?;
+		let controller = scenario.origin_controller1.clone();
+		let stash = scenario.origin_stash1.clone();
+		assert!(T::SortedListProvider::contains(&stash));
 		add_slashing_spans::<T>(&stash, s);
-	}: _(RawOrigin::Root, stash, s)
+
+	}: _(RawOrigin::Root, stash.clone(), s)
 	verify {
 		assert!(!Ledger::<T>::contains_key(&controller));
+		assert!(!T::SortedListProvider::contains(&stash));
 	}
 
 	cancel_deferred_slash {
@@ -440,19 +626,44 @@ benchmarks! {
 
 	rebond {
 		let l in 1 .. MAX_UNLOCKING_CHUNKS as u32;
-		let (_, controller) = create_stash_controller::<T>(USER_SEED, 100, Default::default())?;
-		let mut staking_ledger = Ledger::<T>::get(controller.clone()).unwrap();
+
+		// clean up any existing state.
+		clear_validators_and_nominators::<T>();
+
+		let origin_weight = MinNominatorBond::<T>::get()
+			.max(T::Currency::minimum_balance())
+			// we use 100 to play friendly with the bags, list threshold values in the mock.
+			.max(100u32.into());
+
+		// setup a worst case list scenario.
+		let scenario = ListScenario::<T>::new(origin_weight, true)?;
+		let dest_weight = scenario.dest_weight.clone();
+
+		// rebond an amount that will give the use dest_weight
+		let rebond_amount = dest_weight - origin_weight;
+
+		// spread that amount to rebond across `l` unlocking chunks,
+		let value = rebond_amount / l.into();
+		// so the sum of unlocking chunks puts voter into the dest bag.
+		assert!(value * l.into() + origin_weight > origin_weight);
+		assert!(value * l.into() + origin_weight <= dest_weight);
 		let unlock_chunk = UnlockChunk::<BalanceOf<T>> {
-			value: 1u32.into(),
+			value,
 			era: EraIndex::zero(),
 		};
+
+		let stash = scenario.origin_stash1.clone();
+		let controller = scenario.origin_controller1.clone();
+		let mut staking_ledger = Ledger::<T>::get(controller.clone()).unwrap();
+
 		for _ in 0 .. l {
 			staking_ledger.unlocking.push(unlock_chunk.clone())
 		}
 		Ledger::<T>::insert(controller.clone(), staking_ledger.clone());
 		let original_bonded: BalanceOf<T> = staking_ledger.active;
+
 		whitelist_account!(controller);
-	}: _(RawOrigin::Signed(controller.clone()), (l + 100).into())
+	}: _(RawOrigin::Signed(controller.clone()), rebond_amount)
 	verify {
 		let ledger = Ledger::<T>::get(&controller).ok_or("ledger not created after")?;
 		let new_bonded: BalanceOf<T> = ledger.active;
@@ -479,19 +690,28 @@ benchmarks! {
 
 	reap_stash {
 		let s in 1 .. MAX_SPANS;
-		let (stash, controller) = create_stash_controller::<T>(0, 100, Default::default())?;
-		Staking::<T>::validate(RawOrigin::Signed(controller.clone()).into(), ValidatorPrefs::default())?;
+		// clean up any existing state.
+		clear_validators_and_nominators::<T>();
+
+		let origin_weight = MinNominatorBond::<T>::get().max(T::Currency::minimum_balance());
+
+		// setup a worst case list scenario. Note that we don't care about the setup of the
+		// destination position because we are doing a removal from the list but no insert.
+		let scenario = ListScenario::<T>::new(origin_weight, true)?;
+		let controller = scenario.origin_controller1.clone();
+		let stash = scenario.origin_stash1.clone();
+
 		add_slashing_spans::<T>(&stash, s);
 		T::Currency::make_free_balance_be(&stash, T::Currency::minimum_balance());
-		whitelist_account!(controller);
 
 		assert!(Bonded::<T>::contains_key(&stash));
-		assert!(Validators::<T>::contains_key(&stash));
+		assert!(T::SortedListProvider::contains(&stash));
 
+		whitelist_account!(controller);
 	}: _(RawOrigin::Signed(controller), stash.clone(), s)
 	verify {
 		assert!(!Bonded::<T>::contains_key(&stash));
-		assert!(!Validators::<T>::contains_key(&stash));
+		assert!(!T::SortedListProvider::contains(&stash));
 	}
 
 	new_era {
@@ -637,8 +857,18 @@ benchmarks! {
 	}
 
 	chill_other {
-		let (_, controller) = create_stash_controller::<T>(USER_SEED, 100, Default::default())?;
-		Staking::<T>::validate(RawOrigin::Signed(controller.clone()).into(), ValidatorPrefs::default())?;
+		// clean up any existing state.
+		clear_validators_and_nominators::<T>();
+
+		let origin_weight = MinNominatorBond::<T>::get().max(T::Currency::minimum_balance());
+
+		// setup a worst case list scenario. Note that we don't care about the setup of the
+		// destination position because we are doing a removal from the list but no insert.
+		let scenario = ListScenario::<T>::new(origin_weight, true)?;
+		let controller = scenario.origin_controller1.clone();
+		let stash = scenario.origin_stash1.clone();
+		assert!(T::SortedListProvider::contains(&stash));
+
 		Staking::<T>::set_staking_limits(
 			RawOrigin::Root.into(),
 			BalanceOf::<T>::max_value(),
@@ -647,10 +877,11 @@ benchmarks! {
 			Some(0),
 			Some(Percent::from_percent(0))
 		)?;
+
 		let caller = whitelisted_caller();
 	}: _(RawOrigin::Signed(caller), controller.clone())
 	verify {
-		assert!(!Validators::<T>::contains_key(controller));
+		assert!(!T::SortedListProvider::contains(&stash));
 	}
 }
 
diff --git a/frame/staking/src/pallet/impls.rs b/frame/staking/src/pallet/impls.rs
index b6df94adb3b73..bd971e15ae45b 100644
--- a/frame/staking/src/pallet/impls.rs
+++ b/frame/staking/src/pallet/impls.rs
@@ -1273,7 +1273,6 @@ impl<T: Config> SortedListProvider<T::AccountId> for UseNominatorsMap<T> {
 	fn sanity_check() -> Result<(), &'static str> {
 		Ok(())
 	}
-
 	fn clear() {
 		Nominators::<T>::remove_all(None);
 		CounterForNominators::<T>::kill();
diff --git a/frame/staking/src/pallet/mod.rs b/frame/staking/src/pallet/mod.rs
index fe1f63982687e..695a57c06a58f 100644
--- a/frame/staking/src/pallet/mod.rs
+++ b/frame/staking/src/pallet/mod.rs
@@ -768,13 +768,14 @@ pub mod pallet {
 					Error::<T>::InsufficientBond
 				);
 
+				// ledger must be updated prior to calling `Self::weight_of`.
+				Self::update_ledger(&controller, &ledger);
 				// update this staker in the sorted list, if they exist in it.
 				if T::SortedListProvider::contains(&stash) {
 					T::SortedListProvider::on_update(&stash, Self::weight_of(&ledger.stash));
 				}
 
 				Self::deposit_event(Event::<T>::Bonded(stash.clone(), extra));
-				Self::update_ledger(&controller, &ledger);
 			}
 			Ok(())
 		}
diff --git a/frame/staking/src/testing_utils.rs b/frame/staking/src/testing_utils.rs
index 10348761268ae..2e57931c6f3cf 100644
--- a/frame/staking/src/testing_utils.rs
+++ b/frame/staking/src/testing_utils.rs
@@ -53,9 +53,18 @@ pub fn create_funded_user<T: Config>(
 ) -> T::AccountId {
 	let user = account(string, n, SEED);
 	let balance = T::Currency::minimum_balance() * balance_factor.into();
-	T::Currency::make_free_balance_be(&user, balance);
-	// ensure T::CurrencyToVote will work correctly.
-	T::Currency::issue(balance);
+	let _ = T::Currency::make_free_balance_be(&user, balance);
+	user
+}
+
+/// Grab a funded user with max Balance.
+pub fn create_funded_user_with_balance<T: Config>(
+	string: &'static str,
+	n: u32,
+	balance: BalanceOf<T>,
+) -> T::AccountId {
+	let user = account(string, n, SEED);
+	let _ = T::Currency::make_free_balance_be(&user, balance);
 	user
 }
 
@@ -79,6 +88,26 @@ pub fn create_stash_controller<T: Config>(
 	return Ok((stash, controller))
 }
 
+/// Create a stash and controller pair with fixed balance.
+pub fn create_stash_controller_with_balance<T: Config>(
+	n: u32,
+	balance: crate::BalanceOf<T>,
+	destination: RewardDestination<T::AccountId>,
+) -> Result<(T::AccountId, T::AccountId), &'static str> {
+	let stash = create_funded_user_with_balance::<T>("stash", n, balance);
+	let controller = create_funded_user_with_balance::<T>("controller", n, balance);
+	let controller_lookup: <T::Lookup as StaticLookup>::Source =
+		T::Lookup::unlookup(controller.clone());
+
+	Staking::<T>::bond(
+		RawOrigin::Signed(stash.clone()).into(),
+		controller_lookup,
+		balance,
+		destination,
+	)?;
+	Ok((stash, controller))
+}
+
 /// Create a stash and controller pair, where the controller is dead, and payouts go to controller.
 /// This is used to test worst case payout scenarios.
 pub fn create_stash_and_dead_controller<T: Config>(
@@ -105,11 +134,12 @@ pub fn create_stash_and_dead_controller<T: Config>(
 pub fn create_validators<T: Config>(
 	max: u32,
 	balance_factor: u32,
+	seed: u32,
 ) -> Result<Vec<<T::Lookup as StaticLookup>::Source>, &'static str> {
 	let mut validators: Vec<<T::Lookup as StaticLookup>::Source> = Vec::with_capacity(max as usize);
 	for i in 0..max {
 		let (stash, controller) =
-			create_stash_controller::<T>(i, balance_factor, RewardDestination::Staked)?;
+			create_stash_controller::<T>(i + seed, balance_factor, RewardDestination::Staked)?;
 		let validator_prefs =
 			ValidatorPrefs { commission: Perbill::from_percent(50), ..Default::default() };
 		Staking::<T>::validate(RawOrigin::Signed(controller).into(), validator_prefs)?;
diff --git a/utils/frame/generate-bags/Cargo.toml b/utils/frame/generate-bags/Cargo.toml
new file mode 100644
index 0000000000000..ecbc09b05f7f7
--- /dev/null
+++ b/utils/frame/generate-bags/Cargo.toml
@@ -0,0 +1,28 @@
+[package]
+name = "generate-bags"
+version = "3.0.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
+license = "Apache-2.0"
+homepage = "https://substrate.dev"
+repository = "https://github.com/paritytech/substrate/"
+description = "Bag threshold generation script for pallet-bag-list"
+readme = "README.md"
+
+[dependencies]
+node-runtime = { version = "3.0.0-dev", path = "../../../bin/node/runtime" }
+
+# FRAME
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../../../frame/support" }
+frame-election-provider-support = { version = "4.0.0-dev", path = "../../../frame/election-provider-support", features = ["runtime-benchmarks"] }
+frame-system = { version = "4.0.0-dev", default-features = false, path = "../../../frame/system" }
+pallet-staking = { version = "4.0.0-dev", default-features = false, path = "../../../frame/staking" }
+
+# primitives
+sp-io = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/io" }
+
+# third party
+chrono = { version = "0.4.19" }
+git2 = { version = "0.13.20", default-features = false }
+num-format = { version = "0.4.0" }
+structopt = "0.3.21"
diff --git a/frame/bags-list/generate-bags/Cargo.toml b/utils/frame/generate-bags/node-runtime/Cargo.toml
similarity index 57%
rename from frame/bags-list/generate-bags/Cargo.toml
rename to utils/frame/generate-bags/node-runtime/Cargo.toml
index 7d86865f15adb..5b517e4162b2a 100644
--- a/frame/bags-list/generate-bags/Cargo.toml
+++ b/utils/frame/generate-bags/node-runtime/Cargo.toml
@@ -10,15 +10,14 @@ description = "Bag threshold generation script for pallet-bag-list and node-runt
 readme = "README.md"
 
 [dependencies]
-node-runtime = { version = "3.0.0-dev", path = "../../../bin/node/runtime" }
+node-runtime = { version = "3.0.0-dev", path = "../../../../bin/node/runtime" }
+generate-bags = { version = "3.0.0", path = "../" }
 
 # FRAME
-frame-support = { version = "4.0.0-dev", default-features = false, path = "../../support" }
-pallet-bags-list = { version = "4.0.0-dev", path = "../../bags-list", features = ["generate-bags"] }
-pallet-staking = { version = "4.0.0-dev", default-features = false, path = "../../staking" }
+frame-support = { version = "4.0.0-dev", default-features = false, path = "../../../../frame/support" }
 
 # primitives
-sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" }
+sp-io = { version = "4.0.0-dev", path = "../../../../primitives/io" }
 
 # third-party
 structopt = "0.3.21"
diff --git a/frame/bags-list/generate-bags/src/main.rs b/utils/frame/generate-bags/node-runtime/src/main.rs
similarity index 82%
rename from frame/bags-list/generate-bags/src/main.rs
rename to utils/frame/generate-bags/node-runtime/src/main.rs
index 7f0bb5c7be74b..f99acdbfcea15 100644
--- a/frame/bags-list/generate-bags/src/main.rs
+++ b/utils/frame/generate-bags/node-runtime/src/main.rs
@@ -15,11 +15,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Make the set of bag thresholds to be used in pallet-bags-list.
+//! Make the set of bag thresholds to be used with pallet-bags-list.
 
-use pallet_bags_list::generate_bags::generate_thresholds_module;
+use generate_bags::generate_thresholds;
 use std::path::PathBuf;
 use structopt::StructOpt;
+
 #[derive(Debug, StructOpt)]
 struct Opt {
 	/// How many bags to generate.
@@ -34,5 +35,5 @@ fn main() -> Result<(), std::io::Error> {
 	let Opt { n_bags, output } = Opt::from_args();
 	let mut ext = sp_io::TestExternalities::new_empty();
 
-	ext.execute_with(|| generate_thresholds_module::<node_runtime::Runtime>(n_bags, &output))
+	ext.execute_with(|| generate_thresholds::<node_runtime::Runtime>(n_bags, &output))
 }
diff --git a/frame/bags-list/src/generate_bags.rs b/utils/frame/generate-bags/src/lib.rs
similarity index 97%
rename from frame/bags-list/src/generate_bags.rs
rename to utils/frame/generate-bags/src/lib.rs
index 3f47798a87e2b..dc79812682373 100644
--- a/frame/bags-list/src/generate_bags.rs
+++ b/utils/frame/generate-bags/src/lib.rs
@@ -38,7 +38,7 @@
 //!
 //! 2. Write a little program to generate the definitions. This can be a near-identical copy of
 //!    `substrate/frame/bags-list/generate-bags`. This program exists only to hook together the
-//! runtime    definitions with the various calculations here.
+//!    runtime definitions with the various calculations here.
 //!
 //! 3. Run that program:
 //!
@@ -66,7 +66,6 @@ use std::{
 /// Note that this value depends on the current issuance, a quantity known to change over time.
 /// This makes the project of computing a static value suitable for inclusion in a static,
 /// generated file _excitingly unstable_.
-#[cfg(any(feature = "std", feature = "generate-bags"))]
 fn existential_weight<T: pallet_staking::Config>() -> VoteWeight {
 	use frame_support::traits::{Currency, CurrencyToVote};
 
@@ -160,7 +159,7 @@ pub fn thresholds(
 /// - Module documentation noting that this is autogenerated and when.
 /// - Some associated constants.
 /// - The constant array of thresholds.
-pub fn generate_thresholds_module<T: pallet_staking::Config>(
+pub fn generate_thresholds<T: pallet_staking::Config>(
 	n_bags: usize,
 	output: &Path,
 ) -> Result<(), std::io::Error> {