diff --git a/server.js b/server.js
index d761aee..1c5a973 100644
--- a/server.js
+++ b/server.js
@@ -398,16 +398,22 @@ pool.query(subquery, selectedDevices, (err, result) => {
 
   const minuteInMillis = 60000;
 
-  const devicesData = result.rows.map((row) => ({
-    serial: row.serial,
-    longitude: row.longitude,
-    latitude: row.latitude,
-    direction: row.direction,
-    speed: row.speed,
-    status: Date.now() - Date.parse(row.lastkeepalive) <= minuteInMillis,
-    plate: row.plate,
-    group: row.group,
-  }));
+  const devicesData = result.rows.map((row) => {
+    if (row.speed > 150) {
+      row.speed /= 100;
+    }
+    
+    return {
+      serial: row.serial,
+      longitude: row.longitude,
+      latitude: row.latitude,
+      direction: row.direction,
+      speed: row.speed,
+      status: Date.now() - Date.parse(row.lastkeepalive) <= minuteInMillis,
+      plate: row.plate,
+      group: row.group,
+    };
+  });
   
   console.log(devicesData)
 
@@ -893,7 +899,7 @@ app.get('/reports/:id', async (req, res) => {
       }
 
       templateData.Type = type;
-      templateData.Speed = alarm.speed;
+      templateData.Speed = actualSpeed;
       templateData.Date = formatDate(alarm.time);
       templateData.Serial = alarm.serial;
       templateData.Geo = alarm.latitude + "," + alarm.longitude;
@@ -910,7 +916,14 @@ app.get('/reports/:id', async (req, res) => {
       templateData.NextLatitude = alarm.next_latitude;   
       templateData.NextLongitude = alarm.next_longitude; 
 
-      templateData.Speeds = alarm.nearest_speeds;
+      templateData.Speeds = alarm.nearest_speeds
+      templateData.Speeds = templateData.Speeds.map(speed => {
+        if (speed > 150) {
+          return speed / 100;
+        } else {
+          return speed;
+        }
+      });
       
     console.log(templateData);
   
diff --git a/static/templates/live.html b/static/templates/live.html
index afe7e03..f72535e 100644
--- a/static/templates/live.html
+++ b/static/templates/live.html
@@ -178,8 +178,8 @@
                           <video id="camera-5"></video>
                           <!-- <video id="camera-6"></video>
                           <video id="camera-7"></video>
-                          <video id="camera-8"></video>
-                          <video id="camera-9"></video>
+                          <video id="camera-8"></video> -->
+                          <!-- <video id="camera-9"></video>
                           <video id="camera-10"></video>
                           <video id="camera-11"></video>
                           <video id="camera-12"></video>