diff --git a/dashboards/time-to-first-payment.json b/dashboards/time-to-first-payment.json
index e909ce98..f50ea39e 100644
--- a/dashboards/time-to-first-payment.json
+++ b/dashboards/time-to-first-payment.json
@@ -15,7 +15,7 @@
       "type": "grafana",
       "id": "grafana",
       "name": "Grafana",
-      "version": "9.1.4"
+      "version": "9.1.6"
     },
     {
       "type": "datasource",
@@ -23,6 +23,12 @@
       "name": "InfluxDB",
       "version": "1.0.0"
     },
+    {
+      "type": "panel",
+      "id": "stat",
+      "name": "Stat",
+      "version": ""
+    },
     {
       "type": "panel",
       "id": "text",
@@ -72,7 +78,7 @@
       },
       "gridPos": {
         "h": 10,
-        "w": 11,
+        "w": 12,
         "x": 0,
         "y": 0
       },
@@ -81,7 +87,7 @@
         "content": "<table style=\"width:100%\">\n<thead>\n  <tr>\n    <th></th>\n    <th></th>\n  </tr>\n</thead>\n<tbody>\n  <tr>\n    <td>Run Id</td>\n    <td>${runId}</td>\n  </tr>\n    <tr>\n    <td>Nitro Version</td>\n    <td>${nitroVersion}</td>\n  </tr>\n  <tr>\n    <td>Client Concurrency</td>\n    <td>${jobCount}</td>\n  </tr>\n  <tr>\n    <td>Payment test duration</td>\n    <td>${testDuration}</td>\n  </tr>\n  <tr>\n    <td>Number of payees</td>\n    <td>${payees}</td>\n  </tr>\n    <tr>\n    <td>Number of payers</td>\n    <td>${payers}</td>\n  </tr>\n     <tr>\n    <td>Number of payee-payers</td>\n    <td>${payeepayers}</td>\n  </tr>\n    <tr>\n    <td>Number of hubs</td>\n    <td>${hubs}</td>\n  </tr>\n      <tr>\n    <td>Latency (ms)</td>\n    <td>${latency}</td>\n  </tr>\n      <tr>\n    <td>Jitter (ms)</td>\n    <td>${jitter}</td>\n  </tr>\n</tbody>\n</table>",
         "mode": "html"
       },
-      "pluginVersion": "9.1.4",
+      "pluginVersion": "9.1.6",
       "title": "Run details",
       "type": "text"
     },
@@ -90,43 +96,10 @@
         "type": "influxdb",
         "uid": "${DS_INFLUXDB}"
       },
-      "description": "The mean time to first payment among ALL clients",
       "fieldConfig": {
         "defaults": {
           "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "axisSoftMax": 100000000,
-            "axisSoftMin": 0,
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
+            "mode": "thresholds"
           },
           "mappings": [],
           "thresholds": {
@@ -136,9 +109,13 @@
                 "color": "green",
                 "value": null
               },
+              {
+                "color": "#EAB839",
+                "value": 100000000
+              },
               {
                 "color": "red",
-                "value": 80
+                "value": 1000000000
               }
             ]
           },
@@ -149,27 +126,27 @@
       "gridPos": {
         "h": 10,
         "w": 12,
-        "x": 11,
+        "x": 12,
         "y": 0
       },
-      "id": 2,
+      "id": 7,
       "options": {
-        "legend": {
+        "colorMode": "value",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
           "calcs": [
             "mean"
           ],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
+          "fields": "/^diagnostics\\.go\\-nitro\\-testground\\-virtual\\-payment\\.time_to_first_payment\\.timer\\.mean$/",
+          "values": false
         },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
+        "textMode": "auto"
       },
+      "pluginVersion": "9.1.6",
       "targets": [
         {
-          "alias": "Average time to first payment",
           "datasource": {
             "type": "influxdb",
             "uid": "${DS_INFLUXDB}"
@@ -177,15 +154,9 @@
           "groupBy": [
             {
               "params": [
-                "1s"
+                "$interval"
               ],
               "type": "time"
-            },
-            {
-              "params": [
-                "none"
-              ],
-              "type": "fill"
             }
           ],
           "measurement": "diagnostics.go-nitro-testground-virtual-payment.time_to_first_payment.timer",
@@ -216,15 +187,15 @@
           ]
         }
       ],
-      "title": "Average time to first payment",
-      "type": "timeseries"
+      "title": "Mean time to first payment",
+      "type": "stat"
     },
     {
       "datasource": {
         "type": "influxdb",
         "uid": "${DS_INFLUXDB}"
       },
-      "description": "",
+      "description": "The mean time to first payment among ALL clients",
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -235,6 +206,7 @@
             "axisColorMode": "text",
             "axisLabel": "",
             "axisPlacement": "auto",
+            "axisSoftMin": 0,
             "barAlignment": 0,
             "drawStyle": "line",
             "fillOpacity": 0,
@@ -244,7 +216,7 @@
               "tooltip": false,
               "viz": false
             },
-            "lineInterpolation": "linear",
+            "lineInterpolation": "smooth",
             "lineWidth": 1,
             "pointSize": 5,
             "scaleDistribution": {
@@ -279,12 +251,12 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 9,
-        "w": 11,
+        "h": 10,
+        "w": 12,
         "x": 0,
         "y": 10
       },
-      "id": 12,
+      "id": 2,
       "options": {
         "legend": {
           "calcs": [
@@ -301,7 +273,7 @@
       },
       "targets": [
         {
-          "alias": "Hub/Provider $tag_wallet",
+          "alias": "TTFP",
           "datasource": {
             "type": "influxdb",
             "uid": "${DS_INFLUXDB}"
@@ -309,29 +281,20 @@
           "groupBy": [
             {
               "params": [
-                "$__interval"
+                "1s"
               ],
               "type": "time"
             },
             {
               "params": [
-                "wallet"
-              ],
-              "type": "tag"
-            },
-            {
-              "params": [
-                "none"
+                "linear"
               ],
               "type": "fill"
             }
           ],
-          "hide": false,
-          "measurement": "diagnostics.go-nitro-testground-virtual-payment.objective_complete_time.timer",
+          "measurement": "diagnostics.go-nitro-testground-virtual-payment.time_to_first_payment.timer",
           "orderByTime": "ASC",
           "policy": "default",
-          "query": "SELECT mean(\"mean\") FROM \"diagnostics.go-nitro-testground-virtual-payment.objective_complete_time.timer\" WHERE (\"run\" =~ /^$runId$/ AND \"type\" = 'VirtualFund' AND \"wallet\" !~ /^${clientAdds:regex}$/) AND $timeFilter GROUP BY time($__interval), \"wallet\" fill(none)",
-          "rawQuery": true,
           "refId": "A",
           "resultFormat": "time_series",
           "select": [
@@ -353,23 +316,11 @@
               "key": "run",
               "operator": "=~",
               "value": "/^$runId$/"
-            },
-            {
-              "condition": "AND",
-              "key": "type",
-              "operator": "=",
-              "value": "VirtualFund"
-            },
-            {
-              "condition": "AND",
-              "key": "wallet",
-              "operator": "!~",
-              "value": "/^$clientAdds$/"
             }
           ]
         }
       ],
-      "title": "Average duration for hub/provider to open virtual channel",
+      "title": "Mean time to first payment",
       "type": "timeseries"
     },
     {
@@ -397,7 +348,7 @@
               "tooltip": false,
               "viz": false
             },
-            "lineInterpolation": "linear",
+            "lineInterpolation": "smooth",
             "lineWidth": 1,
             "pointSize": 5,
             "scaleDistribution": {
@@ -432,9 +383,9 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 9,
+        "h": 10,
         "w": 12,
-        "x": 11,
+        "x": 12,
         "y": 10
       },
       "id": 5,
@@ -454,7 +405,7 @@
       },
       "targets": [
         {
-          "alias": "Client $tag_me",
+          "alias": "Client $tag_me[0]",
           "datasource": {
             "type": "influxdb",
             "uid": "${DS_INFLUXDB}"
@@ -737,6 +688,6 @@
   "timezone": "",
   "title": "Time to First Payment",
   "uid": "5OBBeW37k",
-  "version": 1,
+  "version": 2,
   "weekStart": ""
 }
\ No newline at end of file