diff --git a/node/metrics/snarkOS-grafana.json b/node/metrics/snarkOS-grafana.json
index 8e0a7cacfe..e837e590f7 100644
--- a/node/metrics/snarkOS-grafana.json
+++ b/node/metrics/snarkOS-grafana.json
@@ -1,41 +1,40 @@
-{
-  "__inputs": [
-    {
-      "name": "DS_PROMETHEUS",
-      "label": "prometheus",
-      "description": "",
-      "type": "datasource",
-      "pluginId": "prometheus",
-      "pluginName": "Prometheus"
-    }
-  ],
-  "__elements": {},
-  "__requires": [
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "10.2.3"
-    },
-    {
-      "type": "datasource",
-      "id": "prometheus",
-      "name": "Prometheus",
-      "version": "1.0.0"
-    },
-    {
-      "type": "panel",
-      "id": "stat",
-      "name": "Stat",
-      "version": ""
-    },
-    {
-      "type": "panel",
-      "id": "timeseries",
-      "name": "Time series",
-      "version": ""
-    }
-  ],
+{  "__inputs": [
+  {
+    "name": "DS_PROMETHEUS",
+    "label": "prometheus",
+    "description": "",
+    "type": "datasource",
+    "pluginId": "prometheus",
+    "pluginName": "Prometheus"
+  }
+],
+"__elements": {},
+"__requires": [
+  {
+    "type": "grafana",
+    "id": "grafana",
+    "name": "Grafana",
+    "version": "10.2.3"
+  },
+  {
+    "type": "datasource",
+    "id": "prometheus",
+    "name": "Prometheus",
+    "version": "1.0.0"
+  },
+  {
+    "type": "panel",
+    "id": "stat",
+    "name": "Stat",
+    "version": ""
+  },
+  {
+    "type": "panel",
+    "id": "timeseries",
+    "name": "Time series",
+    "version": ""
+  }
+],
   "annotations": {
     "list": [
       {
@@ -61,11 +60,12 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": null,
+  "id": 1,
   "links": [],
   "liveNow": false,
   "panels": [
     {
+      "collapsed": false,
       "gridPos": {
         "h": 1,
         "w": 24,
@@ -73,6 +73,7 @@
         "y": 0
       },
       "id": 26,
+      "panels": [],
       "title": "Aleo Network",
       "type": "row"
     },
@@ -84,41 +85,76 @@
       "fieldConfig": {
         "defaults": {
           "color": {
-            "mode": "palette-classic"
+            "mode": "thresholds"
           },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 6,
+        "x": 0,
+        "y": 1
+      },
+      "id": 49,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
+      },
+      "pluginVersion": "10.4.1",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "snarkos_blocks_height_total",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "__auto",
+          "range": true,
+          "refId": "A",
+          "useBackend": false
+        }
+      ],
+      "title": "Block Height",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "${DS_PROMETHEUS}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
           },
-          "displayName": "Connected Peers",
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -129,7 +165,7 @@
               },
               {
                 "color": "red",
-                "value": 80
+                "value": 60
               }
             ]
           }
@@ -138,23 +174,28 @@
       },
       "gridPos": {
         "h": 8,
-        "w": 12,
-        "x": 0,
+        "w": 6,
+        "x": 6,
         "y": 1
       },
-      "id": 27,
+      "id": 48,
       "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
         },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
       },
+      "pluginVersion": "10.4.1",
       "targets": [
         {
           "datasource": {
@@ -162,14 +203,25 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
-          "expr": "snarkos_router_connected_total",
+          "expr": "avg(\n  1 / rate(snarkos_blocks_height_total{}[1m])\n) < +inf",
+          "instant": false,
           "legendFormat": "__auto",
           "range": true,
           "refId": "A"
         }
       ],
-      "title": "Connected Peers",
-      "type": "timeseries"
+      "title": "Average Seconds/Block over last minute",
+      "transformations": [
+        {
+          "id": "reduce",
+          "options": {
+            "reducers": [
+              "mean"
+            ]
+          }
+        }
+      ],
+      "type": "stat"
     },
     {
       "datasource": {
@@ -213,7 +265,6 @@
               "mode": "off"
             }
           },
-          "displayName": "Candidate Peers",
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -221,10 +272,6 @@
               {
                 "color": "green",
                 "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
               }
             ]
           }
@@ -237,7 +284,7 @@
         "x": 12,
         "y": 1
       },
-      "id": 28,
+      "id": 23,
       "options": {
         "legend": {
           "calcs": [],
@@ -250,6 +297,7 @@
           "sort": "none"
         }
       },
+      "pluginVersion": "10.4.1",
       "targets": [
         {
           "datasource": {
@@ -257,13 +305,13 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
-          "expr": "snarkos_router_candidate_total",
+          "expr": "snarkos_blocks_height_total",
           "legendFormat": "__auto",
           "range": true,
           "refId": "A"
         }
       ],
-      "title": "Candidate Peers",
+      "title": "Block Height",
       "type": "timeseries"
     },
     {
@@ -369,8 +417,41 @@
       "fieldConfig": {
         "defaults": {
           "color": {
-            "mode": "thresholds"
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
           },
+          "displayName": "Total Transactions",
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -390,38 +471,39 @@
         "x": 12,
         "y": 9
       },
-      "id": 23,
+      "id": 36,
       "options": {
-        "colorMode": "value",
-        "graphMode": "area",
-        "justifyMode": "auto",
-        "orientation": "auto",
-        "reduceOptions": {
-          "calcs": [
-            "lastNotNull"
-          ],
-          "fields": "",
-          "values": false
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
         },
-        "textMode": "auto",
-        "wideLayout": true
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
       },
-      "pluginVersion": "10.2.3",
       "targets": [
         {
           "datasource": {
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
-          "editorMode": "code",
-          "expr": "snarkos_blocks_height_total",
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "snarkos_blocks_transactions_total",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
+          "instant": false,
           "legendFormat": "__auto",
           "range": true,
-          "refId": "A"
+          "refId": "A",
+          "useBackend": false
         }
       ],
-      "title": "Block Height",
-      "type": "stat"
+      "title": "Total Transactions",
+      "type": "timeseries"
     },
     {
       "datasource": {
@@ -556,7 +638,7 @@
               "mode": "off"
             }
           },
-          "displayName": "Total Transactions",
+          "displayName": "Total Transmissions",
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -576,7 +658,7 @@
         "x": 12,
         "y": 17
       },
-      "id": 36,
+      "id": 42,
       "options": {
         "legend": {
           "calcs": [],
@@ -597,7 +679,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "snarkos_blocks_transactions_total",
+          "expr": "snarkos_blocks_solutions_total",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -607,7 +689,7 @@
           "useBackend": false
         }
       ],
-      "title": "Total Transactions",
+      "title": "Total Solutions",
       "type": "timeseries"
     },
     {
@@ -652,7 +734,7 @@
               "mode": "off"
             }
           },
-          "displayName": "Total Solutions",
+          "displayName": "Total Stake",
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -660,6 +742,10 @@
               {
                 "color": "green",
                 "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
               }
             ]
           }
@@ -672,7 +758,7 @@
         "x": 0,
         "y": 25
       },
-      "id": 41,
+      "id": 31,
       "options": {
         "legend": {
           "calcs": [],
@@ -693,7 +779,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "snarkos_blocks_solutions_total",
+          "expr": "snarkvm_ledger_committee_total_stake",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -703,7 +789,7 @@
           "useBackend": false
         }
       ],
-      "title": "Total Solutions",
+      "title": "Total Stake",
       "type": "timeseries"
     },
     {
@@ -748,7 +834,6 @@
               "mode": "off"
             }
           },
-          "displayName": "Total Transmissions",
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -756,6 +841,10 @@
               {
                 "color": "green",
                 "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
               }
             ]
           }
@@ -768,7 +857,7 @@
         "x": 12,
         "y": 25
       },
-      "id": 42,
+      "id": 47,
       "options": {
         "legend": {
           "calcs": [],
@@ -789,7 +878,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "snarkos_blocks_transmissions_total",
+          "expr": "snarkos_bft_connected_total",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -799,7 +888,7 @@
           "useBackend": false
         }
       ],
-      "title": "Total Transmissions",
+      "title": "SnarkOS BFT Connected Total",
       "type": "timeseries"
     },
     {
@@ -844,7 +933,7 @@
               "mode": "off"
             }
           },
-          "displayName": "Total Stake",
+          "displayName": "Connected Peers",
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -868,7 +957,7 @@
         "x": 0,
         "y": 33
       },
-      "id": 31,
+      "id": 27,
       "options": {
         "legend": {
           "calcs": [],
@@ -887,34 +976,16 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
-          "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "snarkvm_ledger_committee_total_stake",
-          "fullMetaSearch": false,
-          "includeNullMetadata": true,
-          "instant": false,
+          "editorMode": "code",
+          "expr": "snarkos_router_connected_total",
           "legendFormat": "__auto",
           "range": true,
-          "refId": "A",
-          "useBackend": false
+          "refId": "A"
         }
       ],
-      "title": "Total Stake",
+      "title": "Connected Peers",
       "type": "timeseries"
     },
-    {
-      "collapsed": false,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 41
-      },
-      "id": 18,
-      "panels": [],
-      "title": "BFT",
-      "type": "row"
-    },
     {
       "datasource": {
         "type": "prometheus",
@@ -923,8 +994,41 @@
       "fieldConfig": {
         "defaults": {
           "color": {
-            "mode": "thresholds"
+            "mode": "palette-classic"
           },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "displayName": "Candidate Peers",
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -932,6 +1036,10 @@
               {
                 "color": "green",
                 "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
               }
             ]
           }
@@ -940,46 +1048,51 @@
       },
       "gridPos": {
         "h": 8,
-        "w": 6,
-        "x": 0,
-        "y": 42
+        "w": 12,
+        "x": 12,
+        "y": 33
       },
-      "id": 16,
+      "id": 28,
       "options": {
-        "colorMode": "value",
-        "graphMode": "area",
-        "justifyMode": "auto",
-        "orientation": "auto",
-        "reduceOptions": {
-          "calcs": [
-            "lastNotNull"
-          ],
-          "fields": "",
-          "values": false
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
         },
-        "textMode": "auto",
-        "wideLayout": true
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
       },
-      "pluginVersion": "10.2.3",
       "targets": [
         {
           "datasource": {
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
-          "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "snarkos_bft_primary_proposal_round",
-          "fullMetaSearch": false,
-          "includeNullMetadata": true,
+          "editorMode": "code",
+          "expr": "snarkos_router_candidate_total",
           "legendFormat": "__auto",
           "range": true,
-          "refId": "A",
-          "useBackend": false
+          "refId": "A"
         }
       ],
-      "title": "Current Round",
-      "type": "stat"
+      "title": "Candidate Peers",
+      "type": "timeseries"
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 41
+      },
+      "id": 18,
+      "panels": [],
+      "title": "BFT",
+      "type": "row"
     },
     {
       "datasource": {
@@ -1006,11 +1119,11 @@
       },
       "gridPos": {
         "h": 8,
-        "w": 6,
-        "x": 6,
+        "w": 8,
+        "x": 0,
         "y": 42
       },
-      "id": 25,
+      "id": 16,
       "options": {
         "colorMode": "value",
         "graphMode": "area",
@@ -1023,24 +1136,29 @@
           "fields": "",
           "values": false
         },
+        "showPercentChange": false,
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "10.2.3",
+      "pluginVersion": "10.4.1",
       "targets": [
         {
           "datasource": {
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
-          "editorMode": "code",
-          "expr": "snarkos_consensus_last_committed_round",
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "snarkos_bft_primary_proposal_round",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
           "legendFormat": "__auto",
           "range": true,
-          "refId": "A"
+          "refId": "A",
+          "useBackend": false
         }
       ],
-      "title": "Last Committed Round",
+      "title": "Current Round",
       "type": "stat"
     },
     {
@@ -1068,11 +1186,11 @@
       },
       "gridPos": {
         "h": 8,
-        "w": 6,
-        "x": 12,
+        "w": 8,
+        "x": 8,
         "y": 42
       },
-      "id": 12,
+      "id": 25,
       "options": {
         "colorMode": "value",
         "graphMode": "area",
@@ -1085,24 +1203,25 @@
           "fields": "",
           "values": false
         },
+        "showPercentChange": false,
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "10.2.3",
+      "pluginVersion": "10.4.1",
       "targets": [
         {
           "datasource": {
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
-          "editorMode": "builder",
-          "expr": "snarkos_consensus_committed_certificates_total",
+          "editorMode": "code",
+          "expr": "snarkos_consensus_last_committed_round",
           "legendFormat": "__auto",
           "range": true,
           "refId": "A"
         }
       ],
-      "title": "Committed Certificates",
+      "title": "Last Committed Round",
       "type": "stat"
     },
     {
@@ -1130,8 +1249,8 @@
       },
       "gridPos": {
         "h": 8,
-        "w": 6,
-        "x": 18,
+        "w": 8,
+        "x": 16,
         "y": 42
       },
       "id": 24,
@@ -1147,10 +1266,11 @@
           "fields": "",
           "values": false
         },
+        "showPercentChange": false,
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "10.2.3",
+      "pluginVersion": "10.4.1",
       "targets": [
         {
           "datasource": {
@@ -1192,362 +1312,28 @@
       },
       "gridPos": {
         "h": 8,
-        "w": 6,
-        "x": 0,
+        "w": 7,
+        "x": 4,
         "y": 50
       },
       "id": 40,
       "options": {
         "colorMode": "value",
-        "graphMode": "area",
-        "justifyMode": "auto",
-        "orientation": "auto",
-        "reduceOptions": {
-          "calcs": [
-            "lastNotNull"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "textMode": "auto",
-        "wideLayout": true
-      },
-      "pluginVersion": "10.2.3",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
-          },
-          "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "snarkos_bft_primary_certified_batches",
-          "fullMetaSearch": false,
-          "includeNullMetadata": true,
-          "instant": false,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A",
-          "useBackend": false
-        }
-      ],
-      "title": "Certified Batches",
-      "type": "stat"
-    },
-    {
-      "collapsed": false,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 58
-      },
-      "id": 10,
-      "panels": [],
-      "title": "Consensus",
-      "type": "row"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "displayName": "Average Certificate Commit Latency",
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 9,
-        "x": 0,
-        "y": 59
-      },
-      "id": 8,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "9.4.1",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
-          },
-          "disableTextWrap": false,
-          "editorMode": "builder",
-          "exemplar": false,
-          "expr": "avg(snarkos_consensus_certificate_commit_latency_secs)",
-          "format": "time_series",
-          "fullMetaSearch": false,
-          "includeNullMetadata": true,
-          "instant": false,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A",
-          "useBackend": false
-        }
-      ],
-      "title": "Certificate Commit Latency",
-      "transformations": [
-        {
-          "id": "filterByValue",
-          "options": {
-            "filters": [
-              {
-                "config": {
-                  "id": "equal",
-                  "options": {
-                    "value": ""
-                  }
-                },
-                "fieldName": "certificate_round"
-              }
-            ],
-            "match": "all",
-            "type": "exclude"
-          }
-        }
-      ],
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "displayName": "Average round latency",
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 15
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 9,
-        "x": 9,
-        "y": 59
-      },
-      "id": 14,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
-          },
-          "disableTextWrap": false,
-          "editorMode": "builder",
-          "exemplar": false,
-          "expr": "avg(snarkos_bft_commit_rounds_latency_secs)",
-          "format": "time_series",
-          "fullMetaSearch": false,
-          "includeNullMetadata": true,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A",
-          "useBackend": false
-        }
-      ],
-      "title": "Commit Rounds Latency",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "displayName": "Total Transactions",
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 9,
-        "x": 0,
-        "y": 67
-      },
-      "id": 43,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
         },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
       },
+      "pluginVersion": "10.4.1",
       "targets": [
         {
           "datasource": {
@@ -1556,7 +1342,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "snarkos_consensus_unconfirmed_transactions_total",
+          "expr": "snarkos_bft_primary_certified_batches",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -1566,8 +1352,8 @@
           "useBackend": false
         }
       ],
-      "title": "Total Unconfirmed Transactions",
-      "type": "timeseries"
+      "title": "Certified Batches",
+      "type": "stat"
     },
     {
       "datasource": {
@@ -1577,41 +1363,8 @@
       "fieldConfig": {
         "defaults": {
           "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
+            "mode": "thresholds"
           },
-          "displayName": "Total Solutions",
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -1627,43 +1380,56 @@
       },
       "gridPos": {
         "h": 8,
-        "w": 9,
-        "x": 9,
-        "y": 67
+        "w": 7,
+        "x": 11,
+        "y": 50
       },
-      "id": 44,
+      "id": 12,
       "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
         },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
       },
+      "pluginVersion": "10.4.1",
       "targets": [
         {
           "datasource": {
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
-          "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "snarkos_consensus_unconfirmed_solutions_total",
-          "fullMetaSearch": false,
-          "includeNullMetadata": true,
-          "instant": false,
+          "expr": "snarkos_consensus_committed_certificates_total",
           "legendFormat": "__auto",
           "range": true,
-          "refId": "A",
-          "useBackend": false
+          "refId": "A"
         }
       ],
-      "title": "Total Unconfirmed Solutions",
-      "type": "timeseries"
+      "title": "Committed Certificates",
+      "type": "stat"
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 58
+      },
+      "id": 10,
+      "panels": [],
+      "title": "Consensus",
+      "type": "row"
     },
     {
       "datasource": {
@@ -1707,7 +1473,7 @@
               "mode": "off"
             }
           },
-          "displayName": "Total Transmissions",
+          "displayName": "Average Certificate Commit Latency",
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -1715,19 +1481,24 @@
               {
                 "color": "green",
                 "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
               }
             ]
-          }
+          },
+          "unit": "s"
         },
         "overrides": []
       },
       "gridPos": {
         "h": 8,
-        "w": 9,
+        "w": 12,
         "x": 0,
-        "y": 75
+        "y": 59
       },
-      "id": 45,
+      "id": 8,
       "options": {
         "legend": {
           "calcs": [],
@@ -1740,6 +1511,7 @@
           "sort": "none"
         }
       },
+      "pluginVersion": "9.4.1",
       "targets": [
         {
           "datasource": {
@@ -1748,7 +1520,9 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "snarkos_consensus_unconfirmed_transmissions_total",
+          "exemplar": false,
+          "expr": "avg(snarkos_consensus_certificate_commit_latency_secs)",
+          "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -1758,7 +1532,27 @@
           "useBackend": false
         }
       ],
-      "title": "Total Unconfirmed Transmissions",
+      "title": "Certificate Commit Latency",
+      "transformations": [
+        {
+          "id": "filterByValue",
+          "options": {
+            "filters": [
+              {
+                "config": {
+                  "id": "equal",
+                  "options": {
+                    "value": ""
+                  }
+                },
+                "fieldName": "certificate_round"
+              }
+            ],
+            "match": "all",
+            "type": "exclude"
+          }
+        }
+      ],
       "type": "timeseries"
     },
     {
@@ -1803,7 +1597,7 @@
               "mode": "off"
             }
           },
-          "displayName": "Average Block Latency",
+          "displayName": "Average round latency",
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -1814,20 +1608,21 @@
               },
               {
                 "color": "red",
-                "value": 80
+                "value": 15
               }
             ]
-          }
+          },
+          "unit": "s"
         },
         "overrides": []
       },
       "gridPos": {
         "h": 8,
-        "w": 9,
-        "x": 9,
-        "y": 75
+        "w": 12,
+        "x": 12,
+        "y": 59
       },
-      "id": 38,
+      "id": 14,
       "options": {
         "legend": {
           "calcs": [],
@@ -1848,32 +1643,20 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "avg(snarkos_consensus_block_latency_secs)",
+          "exemplar": false,
+          "expr": "avg(snarkos_bft_commit_rounds_latency_secs)",
+          "format": "time_series",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
-          "instant": false,
           "legendFormat": "__auto",
           "range": true,
           "refId": "A",
           "useBackend": false
         }
       ],
-      "title": "Block Latency",
+      "title": "Commit Rounds Latency",
       "type": "timeseries"
     },
-    {
-      "collapsed": false,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 83
-      },
-      "id": 4,
-      "panels": [],
-      "title": "Network",
-      "type": "row"
-    },
     {
       "datasource": {
         "type": "prometheus",
@@ -1916,7 +1699,7 @@
               "mode": "off"
             }
           },
-          "displayName": "Queue Depth",
+          "displayName": "Total Transactions",
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -1924,10 +1707,6 @@
               {
                 "color": "green",
                 "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
               }
             ]
           }
@@ -1937,10 +1716,10 @@
       "gridPos": {
         "h": 8,
         "w": 12,
-        "x": 6,
-        "y": 84
+        "x": 0,
+        "y": 67
       },
-      "id": 37,
+      "id": 43,
       "options": {
         "legend": {
           "calcs": [],
@@ -1961,7 +1740,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "snarkos_tcp_tasks_total",
+          "expr": "snarkos_consensus_unconfirmed_transactions_total",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -1971,7 +1750,7 @@
           "useBackend": false
         }
       ],
-      "title": "TCP Queue Depth",
+      "title": "Total Unconfirmed Transactions",
       "type": "timeseries"
     },
     {
@@ -2016,7 +1795,7 @@
               "mode": "off"
             }
           },
-          "displayName": "average encrypt time",
+          "displayName": "Total Solutions",
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -2024,24 +1803,19 @@
               {
                 "color": "green",
                 "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
               }
             ]
-          },
-          "unit": "µs"
+          }
         },
         "overrides": []
       },
       "gridPos": {
         "h": 8,
         "w": 12,
-        "x": 0,
-        "y": 92
+        "x": 12,
+        "y": 67
       },
-      "id": 32,
+      "id": 44,
       "options": {
         "legend": {
           "calcs": [],
@@ -2062,7 +1836,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "avg(snarkos_tcp_noise_codec_encryption_micros)",
+          "expr": "snarkos_consensus_unconfirmed_solutions_total",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -2072,7 +1846,7 @@
           "useBackend": false
         }
       ],
-      "title": "Encryption Time",
+      "title": "Total Unconfirmed Solutions",
       "type": "timeseries"
     },
     {
@@ -2117,7 +1891,7 @@
               "mode": "off"
             }
           },
-          "displayName": "average decrypt time",
+          "displayName": "Total Transmissions",
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -2125,24 +1899,19 @@
               {
                 "color": "green",
                 "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
               }
             ]
-          },
-          "unit": "µs"
+          }
         },
         "overrides": []
       },
       "gridPos": {
         "h": 8,
         "w": 12,
-        "x": 12,
-        "y": 92
+        "x": 0,
+        "y": 75
       },
-      "id": 33,
+      "id": 45,
       "options": {
         "legend": {
           "calcs": [],
@@ -2163,20 +1932,17 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "exemplar": false,
-          "expr": "avg(snarkos_tcp_noise_codec_decryption_micros)",
-          "format": "time_series",
+          "expr": "snarkos_consensus_unconfirmed_transmissions_total",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
-          "interval": "",
           "legendFormat": "__auto",
           "range": true,
           "refId": "A",
           "useBackend": false
         }
       ],
-      "title": "Decryption Time",
+      "title": "Total Unconfirmed Transmissions",
       "type": "timeseries"
     },
     {
@@ -2221,7 +1987,7 @@
               "mode": "off"
             }
           },
-          "displayName": "Average Size",
+          "displayName": "Average Block Latency",
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -2235,18 +2001,17 @@
                 "value": 80
               }
             ]
-          },
-          "unit": "decbytes"
+          }
         },
         "overrides": []
       },
       "gridPos": {
         "h": 8,
         "w": 12,
-        "x": 0,
-        "y": 100
+        "x": 12,
+        "y": 75
       },
-      "id": 34,
+      "id": 38,
       "options": {
         "legend": {
           "calcs": [],
@@ -2267,7 +2032,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "avg(snarkos_tcp_noise_codec_encryption_size)",
+          "expr": "avg(snarkos_consensus_block_latency_secs)",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -2277,9 +2042,22 @@
           "useBackend": false
         }
       ],
-      "title": "Encryption Size",
+      "title": "Block Latency",
       "type": "timeseries"
     },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 83
+      },
+      "id": 4,
+      "panels": [],
+      "title": "Network",
+      "type": "row"
+    },
     {
       "datasource": {
         "type": "prometheus",
@@ -2322,7 +2100,7 @@
               "mode": "off"
             }
           },
-          "displayName": "Average Size",
+          "displayName": "Queue Depth",
           "mappings": [],
           "thresholds": {
             "mode": "absolute",
@@ -2336,18 +2114,17 @@
                 "value": 80
               }
             ]
-          },
-          "unit": "decbytes"
+          }
         },
         "overrides": []
       },
       "gridPos": {
         "h": 8,
         "w": 12,
-        "x": 12,
-        "y": 100
+        "x": 6,
+        "y": 84
       },
-      "id": 35,
+      "id": 37,
       "options": {
         "legend": {
           "calcs": [],
@@ -2368,7 +2145,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "avg(snarkos_tcp_noise_codec_decryption_size)",
+          "expr": "snarkos_tcp_tasks_total",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -2378,7 +2155,7 @@
           "useBackend": false
         }
       ],
-      "title": "Decryption Size",
+      "title": "TCP Queue Depth",
       "type": "timeseries"
     }
   ],
@@ -2412,7 +2189,6 @@
   },
   "timezone": "",
   "title": "snarkOS",
-  "uid": "ahTJm4-4k",
-  "version": 1,
+  "version": 3,
   "weekStart": ""
 }
\ No newline at end of file