diff --git a/grafana/grafana-dashboard-switches.json b/grafana/grafana-dashboard-switches.json
index d80e11a..43e32f9 100644
--- a/grafana/grafana-dashboard-switches.json
+++ b/grafana/grafana-dashboard-switches.json
@@ -23,14 +23,16 @@
   "liveNow": false,
   "panels": [
     {
+      "collapsed": false,
       "gridPos": {
         "h": 1,
         "w": 24,
         "x": 0,
         "y": 0
       },
-      "id": 9,
-      "title": "Row title",
+      "id": 15,
+      "panels": [],
+      "title": "BASED ON PORTS",
       "type": "row"
     },
     {
@@ -80,8 +82,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -89,7 +90,7 @@
               }
             ]
           },
-          "unit": "binBps"
+          "unit": "pps"
         },
         "overrides": []
       },
@@ -119,8 +120,8 @@
             "uid": "PBFA97CFB590B2093"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "rate(interfaces_counters_in_octets{source=\"$source\", interface_name=\"$Ethernet\"}[1m])",
+          "editorMode": "code",
+          "expr": "avg by(interface_name) (rate(interfaces_counters_in_octets{source=\"$source\", interface_name=\"$Ethernet\"}[1m]))",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -136,7 +137,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "rate(interfaces_counters_out_octets{source=\"$source\", interface_name=\"$Ethernet\"}[1m])",
+          "expr": "avg by(interface_name) (rate(interfaces_counters_out_octets{source=\"$source\", interface_name=\"$Ethernet\"}[1m]))",
           "fullMetaSearch": false,
           "hide": false,
           "includeNullMetadata": true,
@@ -197,8 +198,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -206,7 +206,7 @@
               }
             ]
           },
-          "unit": "binBps"
+          "unit": "pps"
         },
         "overrides": []
       },
@@ -216,7 +216,7 @@
         "x": 12,
         "y": 1
       },
-      "id": 8,
+      "id": 7,
       "options": {
         "legend": {
           "calcs": [],
@@ -237,7 +237,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "rate(interfaces_counters_in_unicast_pkts{source=\"$source\", interface_name=\"$Ethernet\"}[1m])",
+          "expr": "avg by(interface_name) (rate(interfaces_counters_in_broadcast_pkts{source=\"$source\", interface_name=\"$Ethernet\"}[1m]))",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -253,7 +253,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "rate(interfaces_counters_out_unicast_pkts{source=\"$source\", interface_name=\"$Ethernet\"}[1m])",
+          "expr": "avg by(interface_name) (rate(interfaces_counters_out_broadcast_pkts{source=\"$source\", interface_name=\"$Ethernet\"}[1m]))",
           "fullMetaSearch": false,
           "hide": false,
           "includeNullMetadata": true,
@@ -264,7 +264,7 @@
           "useBackend": false
         }
       ],
-      "title": "Unicast Packets",
+      "title": "Broadcast Pkts",
       "type": "timeseries"
     },
     {
@@ -314,8 +314,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -323,7 +322,7 @@
               }
             ]
           },
-          "unit": "binBps"
+          "unit": "pps"
         },
         "overrides": []
       },
@@ -353,8 +352,8 @@
             "uid": "PBFA97CFB590B2093"
           },
           "disableTextWrap": false,
-          "editorMode": "builder",
-          "expr": "rate(interfaces_counters_in_multicast_pkts{source=\"$source\", interface_name=\"$Ethernet\"}[1m])",
+          "editorMode": "code",
+          "expr": "avg by(interface_name) (rate(interfaces_counters_in_multicast_pkts{source=\"$source\", interface_name=\"$Ethernet\"}[1m]))",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -370,7 +369,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "rate(interfaces_counters_out_multicast_pkts{source=\"$source\", interface_name=\"$Ethernet\"}[1m])",
+          "expr": "avg by(interface_name) (rate(interfaces_counters_out_multicast_pkts{source=\"$source\", interface_name=\"$Ethernet\"}[1m]))",
           "fullMetaSearch": false,
           "hide": false,
           "includeNullMetadata": true,
@@ -431,8 +430,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -440,7 +438,7 @@
               }
             ]
           },
-          "unit": "binBps"
+          "unit": "pps"
         },
         "overrides": []
       },
@@ -450,7 +448,7 @@
         "x": 12,
         "y": 9
       },
-      "id": 7,
+      "id": 8,
       "options": {
         "legend": {
           "calcs": [],
@@ -471,7 +469,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "rate(interfaces_counters_in_broadcast_pkts{source=\"$source\", interface_name=\"$Ethernet\"}[1m])",
+          "expr": "avg by(interface_name) (rate(interfaces_counters_in_unicast_pkts{source=\"$source\", interface_name=\"$Ethernet\"}[1m]))",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -487,7 +485,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "rate(interfaces_counters_out_broadcast_pkts{source=\"$source\", interface_name=\"$Ethernet\"}[1m])",
+          "expr": "avg by(interface_name) (rate(interfaces_counters_out_unicast_pkts{source=\"$source\", interface_name=\"$Ethernet\"}[1m]))",
           "fullMetaSearch": false,
           "hide": false,
           "includeNullMetadata": true,
@@ -498,9 +496,22 @@
           "useBackend": false
         }
       ],
-      "title": "Broadcast Pkts",
+      "title": "Unicast Packets",
       "type": "timeseries"
     },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 17
+      },
+      "id": 14,
+      "panels": [],
+      "title": "BASED ON SWITCHES",
+      "type": "row"
+    },
     {
       "datasource": {
         "type": "prometheus",
@@ -556,17 +567,17 @@
               }
             ]
           },
-          "unit": "none"
+          "unit": "pps"
         },
         "overrides": []
       },
       "gridPos": {
-        "h": 10,
-        "w": 22,
-        "x": 1,
-        "y": 17
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 18
       },
-      "id": 4,
+      "id": 11,
       "options": {
         "legend": {
           "calcs": [],
@@ -585,15 +596,152 @@
             "type": "prometheus",
             "uid": "PBFA97CFB590B2093"
           },
-          "editorMode": "code",
-          "expr": "CPU_util ",
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "avg by(source) (rate(interfaces_counters_in_octets{source=\"$source\"}[1m]))",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "{{interface_name}}  (IN)",
+          "range": true,
+          "refId": "A",
+          "useBackend": false
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "PBFA97CFB590B2093"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "avg by(source) (rate(interfaces_counters_out_octets{source=\"$source\"}[1m]))",
+          "fullMetaSearch": false,
+          "hide": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "{{interface_name}} (OUT)",
+          "range": true,
+          "refId": "B",
+          "useBackend": false
+        }
+      ],
+      "title": "Bit Rate (Octets)",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "PBFA97CFB590B2093"
+      },
+      "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"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green"
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "pps"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 18
+      },
+      "id": 12,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "PBFA97CFB590B2093"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "avg by(source) (rate(interfaces_counters_in_multicast_pkts{source=\"$source\"}[1m]))",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
           "instant": false,
-          "legendFormat": "__auto",
+          "legendFormat": "{{interface_name}}  (IN)",
           "range": true,
-          "refId": "A"
+          "refId": "A",
+          "useBackend": false
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "PBFA97CFB590B2093"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "avg by(source) (rate(interfaces_counters_out_multicast_pkts{source=\"$source\"}[1m]))",
+          "fullMetaSearch": false,
+          "hide": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "{{interface_name}} (OUT)",
+          "range": true,
+          "refId": "B",
+          "useBackend": false
         }
       ],
-      "title": "CPU util ",
+      "title": "Multicast Packets",
       "type": "timeseries"
     },
     {
@@ -651,7 +799,7 @@
               }
             ]
           },
-          "unit": "bytes"
+          "unit": "pps"
         },
         "overrides": []
       },
@@ -659,9 +807,9 @@
         "h": 8,
         "w": 12,
         "x": 0,
-        "y": 27
+        "y": 26
       },
-      "id": 3,
+      "id": 10,
       "options": {
         "legend": {
           "calcs": [],
@@ -680,15 +828,36 @@
             "type": "prometheus",
             "uid": "PBFA97CFB590B2093"
           },
-          "editorMode": "code",
-          "expr": "RAM_memFree",
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "avg by(source) (rate(interfaces_counters_in_unicast_pkts{source=\"$source\"}[1m]))",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
           "instant": false,
-          "legendFormat": "__auto",
+          "legendFormat": "{{interface_name}}  (IN)",
           "range": true,
-          "refId": "A"
+          "refId": "A",
+          "useBackend": false
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "PBFA97CFB590B2093"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "avg by(source) (rate(interfaces_counters_out_unicast_pkts{source=\"$source\"}[1m]))",
+          "fullMetaSearch": false,
+          "hide": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "{{interface_name}} (OUT)",
+          "range": true,
+          "refId": "B",
+          "useBackend": false
         }
       ],
-      "title": "Mem Free",
+      "title": "Unicast Packets ",
       "type": "timeseries"
     },
     {
@@ -746,7 +915,7 @@
               }
             ]
           },
-          "unit": "bytes"
+          "unit": "pps"
         },
         "overrides": []
       },
@@ -754,9 +923,9 @@
         "h": 8,
         "w": 12,
         "x": 12,
-        "y": 27
+        "y": 26
       },
-      "id": 2,
+      "id": 13,
       "options": {
         "legend": {
           "calcs": [],
@@ -775,16 +944,336 @@
             "type": "prometheus",
             "uid": "PBFA97CFB590B2093"
           },
-          "editorMode": "code",
-          "expr": "RAM_memAvailable",
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "avg by(source) (rate(interfaces_counters_in_broadcast_pkts{source=\"$source\"}[1m]))",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
           "instant": false,
-          "legendFormat": "__auto",
+          "legendFormat": "{{interface_name}}  (IN)",
           "range": true,
-          "refId": "A"
+          "refId": "A",
+          "useBackend": false
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "PBFA97CFB590B2093"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "avg by(source) (rate(interfaces_counters_out_broadcast_pkts{source=\"$source\"}[1m]))",
+          "fullMetaSearch": false,
+          "hide": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "{{interface_name}} (OUT)",
+          "range": true,
+          "refId": "B",
+          "useBackend": false
         }
       ],
-      "title": "Mem Available",
+      "title": "Broadcast Pkts",
       "type": "timeseries"
+    },
+    {
+      "collapsed": true,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 34
+      },
+      "id": 16,
+      "panels": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "PBFA97CFB590B2093"
+          },
+          "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"
+                }
+              },
+              "mappings": [],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "green"
+                  },
+                  {
+                    "color": "red",
+                    "value": 80
+                  }
+                ]
+              },
+              "unit": "none"
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 10,
+            "w": 22,
+            "x": 1,
+            "y": 19
+          },
+          "id": 4,
+          "options": {
+            "legend": {
+              "calcs": [],
+              "displayMode": "list",
+              "placement": "bottom",
+              "showLegend": true
+            },
+            "tooltip": {
+              "mode": "single",
+              "sort": "none"
+            }
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "prometheus",
+                "uid": "PBFA97CFB590B2093"
+              },
+              "editorMode": "builder",
+              "expr": "CPU_util ",
+              "instant": false,
+              "legendFormat": "{{source}}",
+              "range": true,
+              "refId": "A"
+            }
+          ],
+          "title": "CPU util ",
+          "type": "timeseries"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "PBFA97CFB590B2093"
+          },
+          "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"
+                }
+              },
+              "mappings": [],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "green"
+                  },
+                  {
+                    "color": "red",
+                    "value": 80
+                  }
+                ]
+              },
+              "unit": "bytes"
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 0,
+            "y": 29
+          },
+          "id": 3,
+          "options": {
+            "legend": {
+              "calcs": [],
+              "displayMode": "list",
+              "placement": "bottom",
+              "showLegend": true
+            },
+            "tooltip": {
+              "mode": "single",
+              "sort": "none"
+            }
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "prometheus",
+                "uid": "PBFA97CFB590B2093"
+              },
+              "editorMode": "code",
+              "expr": "RAM_memFree",
+              "instant": false,
+              "legendFormat": "{{source}}",
+              "range": true,
+              "refId": "A"
+            }
+          ],
+          "title": "Mem Free",
+          "type": "timeseries"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "PBFA97CFB590B2093"
+          },
+          "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"
+                }
+              },
+              "mappings": [],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "green"
+                  },
+                  {
+                    "color": "red",
+                    "value": 80
+                  }
+                ]
+              },
+              "unit": "bytes"
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 12,
+            "y": 29
+          },
+          "id": 2,
+          "options": {
+            "legend": {
+              "calcs": [],
+              "displayMode": "list",
+              "placement": "bottom",
+              "showLegend": true
+            },
+            "tooltip": {
+              "mode": "single",
+              "sort": "none"
+            }
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "prometheus",
+                "uid": "PBFA97CFB590B2093"
+              },
+              "editorMode": "code",
+              "expr": "RAM_memAvailable",
+              "instant": false,
+              "legendFormat": "{{source}}",
+              "range": true,
+              "refId": "A"
+            }
+          ],
+          "title": "Mem Available",
+          "type": "timeseries"
+        }
+      ],
+      "title": "SYSTEM MERICS",
+      "type": "row"
     }
   ],
   "refresh": "",
@@ -802,7 +1291,7 @@
           "type": "prometheus",
           "uid": "PBFA97CFB590B2093"
         },
-        "definition": "label_values(source)",
+        "definition": "label_values({source=~\"172.22.1.250|172.22.0.5\"},source)",
         "hide": 0,
         "includeAll": false,
         "label": "source",
@@ -811,7 +1300,7 @@
         "options": [],
         "query": {
           "qryType": 1,
-          "query": "label_values(source)",
+          "query": "label_values({source=~\"172.22.1.250|172.22.0.5\"},source)",
           "refId": "PrometheusVariableQueryEditor-VariableQuery"
         },
         "refresh": 1,
@@ -857,6 +1346,6 @@
   "timezone": "",
   "title": "ARISTA Switch  Metrics",
   "uid": "de09c77e-6492-499a-9695-8f8abcba6423",
-  "version": 16,
+  "version": 34,
   "weekStart": ""
 }
\ No newline at end of file