diff --git a/lib/config/config.json b/lib/config/config.json
index 3ccf365d..ef42cde3 100644
--- a/lib/config/config.json
+++ b/lib/config/config.json
@@ -1,6 +1,6 @@
 {
 	"general_refresh_rate" :   100,
-	"general_skin_on_load" :   "Scania",
+	"general_skin_on_load" :   "JAGFx",
 	"general_h-shift-layout" : "h-shifter",
 	"general_skin_locale" :    "en-EN",
 	"general_job_remaining" :  "due_date",
diff --git a/lib/sdk/scs_sdk_plugin_parsed_data.json b/lib/sdk/scs_sdk_plugin_parsed_data.json
index 08f369ac..3a89daa9 100644
--- a/lib/sdk/scs_sdk_plugin_parsed_data.json
+++ b/lib/sdk/scs_sdk_plugin_parsed_data.json
@@ -557,12 +557,12 @@
 			}
 		},
 		"speed" :         {
-			"value" : 0.0009727554861456156,
+			"value" : 36.1111,
 			"kph" :   50,
 			"mph" :   50
 		},
 		"cruiseControl" : {
-			"value" :   90,
+			"value" :   25,
 			"enabled" : true,
 			"kph" :     90,
 			"mph" :     12
@@ -1158,7 +1158,7 @@
 		"distance" :     780480.9375,
 		"time" :         39707175.78125,
 		"speedLimit" :   {
-			"value" : 110,
+			"value" : 30.5556,
 			"kph" :   110,
 			"mph" :   110
 		}
diff --git a/src/components/dashboards/DafXFDashboard.vue b/src/components/dashboards/DafXFDashboard.vue
index 3ca7f082..8c4d5ad1 100644
--- a/src/components/dashboards/DafXFDashboard.vue
+++ b/src/components/dashboards/DafXFDashboard.vue
@@ -31,7 +31,7 @@
         />
         <div class="truck-speedRounded wrapper-area">
           <span>{{
-            $toFixed(unit_speed(telemetry.truck.speed, true, false), 0)
+            unit_speed(telemetry.truck.speed, true, false).toFixed(0)
           }}</span>
         </div>
         <Cadran
@@ -69,17 +69,12 @@
         />
         <div class="truck-odometer wrapper-area">
           <span>{{
-            $toFixed(
-              unit_length(telemetry.truck.odometer, 'km', true, false),
-              0
-            )
+            unit_length(telemetry.truck.odometer, 'km', true, false).toFixed(0)
           }}</span>
         </div>
         <!--				<div class="truck-cruiseControlSpeedRounded wrapper-area"><span>{{ telemetry.truck.cruiseControl.kph }}</span></div>-->
         <div class="truck-gear wrapper-area">
-          <span>{{
-            $trukGear(telemetry.truck.transmission, telemetry.truck.brand)
-          }}</span>
+          <span>{{ telemetry2.truck.gearDisplayed }}</span>
         </div>
         <!-- indicators -->
         <div
@@ -112,9 +107,7 @@
         />
         <div class="trailer-mass wrapper-area">
           <span>
-            {{
-              $toFixed(unit_weight(telemetry.job.cargo.mass, true, false), 1)
-            }}
+            {{ unit_weight(telemetry.job.cargo.mass, true, false).toFixed(1) }}
             <span class="ton">{{
               unit_weight(telemetry.job.cargo.mass, false)
             }}</span>
@@ -135,7 +128,7 @@
         <div class="game-time wrapper-area">
           <span>{{
             $dateTimeLocalized(
-              $gameTime(),
+              telemetry2.gameTime,
               DATE_FORMAT_SHORT,
               TIME_FORMAT_SHORT
             )
diff --git a/src/components/dashboards/Dashboard.vue b/src/components/dashboards/Dashboard.vue
index e39f0950..bdeb33a7 100644
--- a/src/components/dashboards/Dashboard.vue
+++ b/src/components/dashboards/Dashboard.vue
@@ -6,6 +6,7 @@
 
 <script>
 import TelemetryMixin from '@/mixins/TelemetryMixin';
+import { scale } from '@/utils/telemetry/_common.utils';
 import { mapGetters } from 'vuex';
 
 export default {
@@ -33,7 +34,7 @@ export default {
       return this.currentSkin;
     },
     updateScale() {
-      this.currentScale = this.$scale(this.currentSkin);
+      this.currentScale = scale(this.currentSkin);
     }
   }
 };
diff --git a/src/components/dashboards/DefaultDashboard.vue b/src/components/dashboards/DefaultDashboard.vue
index 161a4bad..0b5476bd 100644
--- a/src/components/dashboards/DefaultDashboard.vue
+++ b/src/components/dashboards/DefaultDashboard.vue
@@ -31,7 +31,7 @@
         />
         <div class="truck-speedRounded wrapper-area">
           <span>{{
-            $toFixed(unit_speed(telemetry.truck.speed, true, false), 0)
+            unit_speed(telemetry.truck.speed, true, false).toFixed(0)
           }}</span>
         </div>
         <div class="truck-speedRounded-unit wrapper-area">
@@ -72,19 +72,14 @@
         />
         <div class="truck-odometer wrapper-area">
           <span>{{
-            $toFixed(
-              unit_length(telemetry.truck.odometer, 'km', true, false),
-              0
-            )
+            unit_length(telemetry.truck.odometer, 'km', true, false).toFixed(0)
           }}</span>
         </div>
         <div class="truck-cruiseControlSpeedRounded wrapper-area">
           <span>{{ telemetry.truck.cruiseControl.kph }}</span>
         </div>
         <div class="truck-gear wrapper-area">
-          <span>{{
-            $trukGear(telemetry.truck.transmission, telemetry.truck.brand)
-          }}</span>
+          <span>{{ telemetry2.truck.gearDisplayed }}</span>
         </div>
         <!-- indicators -->
         <div
@@ -116,7 +111,7 @@
           class="trailer-attached"
         />
         <div class="trailer-mass">
-          {{ $toFixed(unit_weight(telemetry.job.cargo.mass, true, false), 1)
+          {{ unit_weight(telemetry.job.cargo.mass, true, false).toFixed(1)
           }}<span class="ton">{{
             unit_weight(telemetry.job.cargo.mass, false)
           }}</span>
@@ -131,7 +126,7 @@
             <td>
               <span class="game-time">{{
                 $dateTimeLocalized(
-                  $gameTime(),
+                  telemetry2.gameTime,
                   DATE_FORMAT_LONG,
                   TIME_FORMAT_SHORT
                 )
@@ -170,9 +165,7 @@
             <th>{{ $t('Deadline in') }}:</th>
             <td>
               <span class="job-remainingTime">{{
-                $jobRemainingTimeDelivery(
-                  telemetry.job.expectedDeliveryTimestamp.value
-                )
+                telemetry2.job.remainingDeliveryTime
               }}</span>
               <span class="_jobIncome">
                 (<span class="job-income">{{
diff --git a/src/components/dashboards/ManTGXDashboard.vue b/src/components/dashboards/ManTGXDashboard.vue
index 3bcc2d66..281e8306 100644
--- a/src/components/dashboards/ManTGXDashboard.vue
+++ b/src/components/dashboards/ManTGXDashboard.vue
@@ -31,7 +31,7 @@
         />
         <div class="truck-speedRounded wrapper-area">
           <span>{{
-            $toFixed(unit_speed(telemetry.truck.speed, true, false), 0)
+            unit_speed(telemetry.truck.speed, true, false).toFixed(0)
           }}</span>
         </div>
         <Cadran
@@ -91,17 +91,12 @@
         />
         <div class="truck-odometer wrapper-area">
           <span>{{
-            $toFixed(
-              unit_length(telemetry.truck.odometer, 'km', true, false),
-              0
-            )
+            unit_length(telemetry.truck.odometer, 'km', true, false).toFixed(0)
           }}</span>
         </div>
         <!--				<div class="truck-cruiseControlSpeedRounded wrapper-area"><span>{{ telemetry.truck.cruiseControl.kph }}</span></div>-->
         <div class="truck-gear wrapper-area">
-          <span>{{
-            $trukGear(telemetry.truck.transmission, telemetry.truck.brand)
-          }}</span>
+          <span>{{ telemetry2.truck.gearDisplayed }}</span>
         </div>
         <!-- indicators -->
         <div
@@ -131,7 +126,7 @@
         <!--				<div :class="{'yes': trailer.attached}" class="trailer-attached"></div>-->
         <div class="trailer-mass wrapper-area">
           <span
-            >{{ $toFixed(unit_weight(telemetry.job.cargo.mass, true, false), 0)
+            >{{ unit_weight(telemetry.job.cargo.mass, true, false).toFixed(0)
             }}<span class="ton">{{
               unit_weight(telemetry.job.cargo.mass, false)
             }}</span></span
@@ -157,7 +152,7 @@
         <div class="game-time wrapper-area">
           <span>{{
             $dateTimeLocalized(
-              $gameTime(),
+              telemetry2.gameTime,
               DATE_FORMAT_SHORT,
               TIME_FORMAT_SHORT
             )
diff --git a/src/components/dashboards/MercedesAtegoDashboard.vue b/src/components/dashboards/MercedesAtegoDashboard.vue
index e7403842..82c47cac 100644
--- a/src/components/dashboards/MercedesAtegoDashboard.vue
+++ b/src/components/dashboards/MercedesAtegoDashboard.vue
@@ -31,7 +31,7 @@
         />
         <div class="truck-speedRounded wrapper-area">
           <span>{{
-            $toFixed(unit_speed(telemetry.truck.speed, true, false), 0)
+            unit_speed(telemetry.truck.speed, true, false).toFixed(0)
           }}</span>
         </div>
         <Cadran
@@ -78,17 +78,12 @@
         />
         <div class="truck-odometer wrapper-area">
           <span>{{
-            $toFixed(
-              unit_length(telemetry.truck.odometer, 'km', true, false),
-              0
-            )
+            unit_length(telemetry.truck.odometer, 'km', true, false).toFixed(0)
           }}</span>
         </div>
         <!--				<div class="truck-cruiseControlSpeedRounded wrapper-area"><span>{{ telemetry.truck.cruiseControl.kph }}</span></div>-->
         <div class="truck-gear wrapper-area">
-          <span>{{
-            $trukGear(telemetry.truck.transmission, telemetry.truck.brand)
-          }}</span>
+          <span>{{ telemetry2.truck.gearDisplayed }}</span>
         </div>
         <!-- indicators -->
         <div
@@ -141,7 +136,7 @@
         <div class="game-time wrapper-area">
           <span>{{
             $dateTimeLocalized(
-              $gameTime(),
+              telemetry2.gameTime,
               DATE_FORMAT_SHORT,
               TIME_FORMAT_SHORT
             )
diff --git a/src/components/dashboards/RdInfoDashboard.vue b/src/components/dashboards/RdInfoDashboard.vue
index ef6e8616..c9f9846c 100644
--- a/src/components/dashboards/RdInfoDashboard.vue
+++ b/src/components/dashboards/RdInfoDashboard.vue
@@ -117,14 +117,11 @@
         </div>
         <div class="truck-fuelAverageConsumption">
           {{
-            $toFixed(
-              unit_consumption(
-                telemetry.truck.fuel.avgConsumption,
-                true,
-                false
-              ),
-              1
-            )
+            unit_consumption(
+              telemetry.truck.fuel.avgConsumption,
+              true,
+              false
+            ).toFixed(1)
           }}
         </div>
         <div class="_fuelAvg">
@@ -169,19 +166,14 @@
         />
         <div class="navigation-speedLimit">
           {{
-            $toFixed(
-              unit_speed(telemetry.navigation.speedLimit, true, false),
-              0
-            )
+            unit_speed(telemetry.navigation.speedLimit, true, false).toFixed(0)
           }}
         </div>
 
         <!--				<div class="truck-odometer wrapper-area"><span>{{ $toFixed(unit_length( telemetry.truck.odometer, 'km', true, false ),  0 ) }}</span></div>-->
         <!--				<div class="truck-cruiseControlSpeedRounded wrapper-area"><span>{{ telemetry.truck.cruiseControl.kph }}</span></div>-->
         <div class="truck-displayedGear wrapper-area">
-          <span>{{
-            $trukGear(telemetry.truck.transmission, telemetry.truck.brand)
-          }}</span>
+          <span>{{ telemetry2.truck.gearDisplayed }}</span>
         </div>
         <!-- indicators -->
         <!--				<div :class="{ 'yes': telemetry.truck.lights.blinker.left.active}" class="truck-blinkerLeftOn"></div>-->
diff --git a/src/components/dashboards/TestDashboard.vue b/src/components/dashboards/TestDashboard.vue
index 3c509959..169ede3c 100644
--- a/src/components/dashboards/TestDashboard.vue
+++ b/src/components/dashboards/TestDashboard.vue
@@ -2,7 +2,7 @@
   <Dashboard class="test wrapper">
     <div class="speed">
       <span class="value">{{
-        $toFixed(unit_speed(telemetry.truck.speed, true, false), 0)
+        unit_speed(telemetry.truck.speed, true, false).toFixed(0)
       }}</span>
       <small class="unit">{{ unit_speed(telemetry.truck.speed, false) }}</small>
     </div>
diff --git a/src/components/dashboards/VolvoFHDashboard.vue b/src/components/dashboards/VolvoFHDashboard.vue
index 838bdc73..5379b6be 100644
--- a/src/components/dashboards/VolvoFHDashboard.vue
+++ b/src/components/dashboards/VolvoFHDashboard.vue
@@ -31,7 +31,7 @@
         />
         <div class="truck-speedRounded wrapper-area">
           <span>{{
-            $toFixed(unit_speed(telemetry.truck.speed, true, false), 0)
+            unit_speed(telemetry.truck.speed, true, false).toFixed(0)
           }}</span>
         </div>
         <Cadran
@@ -74,17 +74,12 @@
         }"></Cadran>-->
         <div class="truck-odometer wrapper-area">
           <span>{{
-            $toFixed(
-              unit_length(telemetry.truck.odometer, 'km', true, false),
-              0
-            )
+            unit_length(telemetry.truck.odometer, 'km', true, false).toFixed(0)
           }}</span>
         </div>
         <!--				<div class="truck-cruiseControlSpeedRounded wrapper-area"><span>{{ telemetry.truck.cruiseControl.kph }}</span></div>-->
         <div class="truck-gear wrapper-area">
-          <span>{{
-            $trukGear(telemetry.truck.transmission, telemetry.truck.brand)
-          }}</span>
+          <span>{{ telemetry2.truck.gearDisplayed }}</span>
         </div>
         <!-- indicators -->
         <div
@@ -117,7 +112,7 @@
         />
         <div class="trailer-mass wrapper-area">
           <span
-            >{{ $toFixed(unit_weight(telemetry.job.cargo.mass, true, false), 1)
+            >{{ unit_weight(telemetry.job.cargo.mass, true, false).toFixed(1)
             }}<span class="ton">{{
               unit_weight(telemetry.job.cargo.mass, false)
             }}</span></span
@@ -129,7 +124,7 @@
         <div class="game-time wrapper-area">
           <span>{{
             $dateTimeLocalized(
-              $gameTime(),
+              telemetry2.gameTime,
               DATE_FORMAT_SHORT,
               TIME_FORMAT_SHORT
             )
diff --git a/src/components/dashboards/jagfx/JagfxSymbolArea.vue b/src/components/dashboards/jagfx/JagfxSymbolArea.vue
index be0ee98d..38f63a52 100644
--- a/src/components/dashboards/jagfx/JagfxSymbolArea.vue
+++ b/src/components/dashboards/jagfx/JagfxSymbolArea.vue
@@ -4,7 +4,7 @@
     <div
       v-if="elementIsEnabled('jagfx_elements_mid_top_parkingBrake')"
       :class="{
-        red: $parent.telemetry.truck.brakes.parking.enabled,
+        red: $parent.telemetry2.symbols.parkingBrakeIsEnabled,
         left: sideLeft(),
         right: sideRight()
       }"
@@ -19,7 +19,7 @@
     <div
       v-if="elementIsEnabled('jagfx_elements_mid_top_retarder')"
       :class="{
-        green: $parent.telemetry.truck.brakes.retarder.level > 0,
+        green: $parent.telemetry2.symbols.retarderIsActive,
         left: sideLeft(),
         right: sideRight()
       }"
@@ -34,7 +34,7 @@
     <div
       v-if="elementIsEnabled('jagfx_elements_mid_top_beacon')"
       :class="{
-        green: $parent.telemetry.truck.lights.beacon.enabled,
+        green: $parent.telemetry2.symbols.beaconIsEnabled,
         left: sideLeft(),
         right: sideRight()
       }"
@@ -49,10 +49,7 @@
     <div
       v-if="elementIsEnabled('jagfx_elements_mid_top_beamHigh')"
       :class="{
-        blue:
-          $parent.telemetry.truck.lights.beamHigh.enabled &&
-          $parent.telemetry.truck.lights.beamLow.enabled &&
-          $parent.telemetry.truck.engine.enabled,
+        blue: $parent.telemetry2.symbols.mainBeamIsEnabled,
         left: sideLeft(),
         right: sideRight()
       }"
@@ -67,9 +64,7 @@
     <div
       v-if="elementIsEnabled('jagfx_elements_mid_top_beamLow')"
       :class="{
-        green:
-          $parent.telemetry.truck.lights.beamLow.enabled &&
-          $parent.telemetry.truck.engine.enabled,
+        green: $parent.telemetry2.symbols.lowBeamIsEnabled,
         left: sideLeft(),
         right: sideRight()
       }"
diff --git a/src/components/dashboards/jagfx/Zone/JagfxJob.vue b/src/components/dashboards/jagfx/Zone/JagfxJob.vue
index aaf04225..ad78bc4b 100644
--- a/src/components/dashboards/jagfx/Zone/JagfxJob.vue
+++ b/src/components/dashboards/jagfx/Zone/JagfxJob.vue
@@ -6,96 +6,90 @@
     <!--<div class="wear">{{Math.floor(100 * telemetry.job.cargo.damage)}}%</div>-->
 
     <ul class="dash-element left">
-      <li :class="{ disabled: !$hasJob() }" class="multiline default">
+      <li
+        :class="{ disabled: !telemetry2.job.hasAnActiveJob }"
+        class="multiline default"
+      >
         <div class="round from">
           <i class="icon-startpoint" />
         </div>
-        <span v-if="!$hasJob()">{{ $t('N/A') }}</span>
+        <span v-if="!telemetry2.job.hasAnActiveJob">{{ $t('N/A') }}</span>
         <span v-else>
-          <span>{{ telemetry.job.source.city.name }}</span>
+          <span>{{ telemetry2.job.departureCityName }}</span>
           <small
             class="text-muted text-italic text-size-1rem text-line-height-1rem"
-            >{{ telemetry.job.source.company.name }}</small
+            >{{ telemetry2.job.departureCompanyName }}</small
           >
         </span>
       </li>
-      <li :class="{ disabled: !$hasJob() }" class="multiline default">
+      <li
+        :class="{ disabled: !telemetry2.job.hasAnActiveJob }"
+        class="multiline default"
+      >
         <div class="round to">
           <i class="icon-endpoint" />
         </div>
-        <span v-if="!$hasJob()">{{ $t('N/A') }}</span>
+        <span v-if="!telemetry2.job.hasAnActiveJob">{{ $t('N/A') }}</span>
         <span v-else>
-          <span>{{ telemetry.job.destination.city.name }}</span>
+          <span>{{ telemetry2.job.arrivalCityName }}</span>
           <small
             class="text-muted text-italic text-size-1rem text-line-height-1rem"
-            >{{ telemetry.job.destination.company.name }}</small
           >
+            {{ telemetry2.job.arrivalCompanyName }}
+          </small>
         </span>
       </li>
-      <li :class="{ disabled: !$hasJob() }" class="default">
+      <li :class="{ disabled: !telemetry2.job.hasAnActiveJob }" class="default">
         <div class="round">
           <i class="icon-time" />
         </div>
-        <span v-if="$hasJob() && $jobRemainingTimeToDueDate()">{{
-          $dateTimeLocalized(
-            $jobDeliveryTime(),
-            DATE_FORMAT_LONG,
-            TIME_FORMAT_SHORT
-          )
-        }}</span>
-        <span v-else-if="$hasJob() && !$jobRemainingTimeToDueDate()">{{
-          $jobRemainingTimeDelivery(
-            telemetry.job.expectedDeliveryTimestamp.value
-          )
-        }}</span>
+        <span
+          v-if="telemetry2.job.hasAnActiveJob && $jobRemainingTimeToDueDate()"
+          >{{
+            $dateTimeLocalized(
+              telemetry2.job.expectedDeliveryTime,
+              DATE_FORMAT_LONG,
+              TIME_FORMAT_SHORT
+            )
+          }}</span
+        >
+        <span
+          v-else-if="
+            telemetry2.job.hasAnActiveJob && !$jobRemainingTimeToDueDate()
+          "
+          >{{ telemetry2.job.remainingDeliveryTime }}</span
+        >
         <span v-else>{{ $t('N/A') }}</span>
       </li>
-      <li :class="{ disabled: !$hasJob() }" class="default">
+      <li :class="{ disabled: !telemetry2.job.hasAnActiveJob }" class="default">
         <div class="round">
           <i class="icon-currency" />
         </div>
-        <span v-if="!$hasJob()">{{ $t('N/A') }}</span>
-        <span v-else>{{ unit_currency(telemetry.job.income) }}</span>
+        <span v-if="!telemetry2.job.hasAnActiveJob">{{ $t('N/A') }}</span>
+        <span v-else>
+          {{ telemetry2.job.income }} {{ $unitReadable('unit_currency') }}
+        </span>
       </li>
       <li
-        :class="{ disabled: telemetry.navigation.distance === 0 }"
+        :class="{ disabled: !telemetry2.navigation.hasAnActiveNavigation }"
         class="default"
       >
         <div class="round">
           <i class="icon-ruler" />
         </div>
-        <span v-if="telemetry.navigation.distance === 0">{{ $t('N/A') }}</span>
-        <span v-else-if="telemetry.navigation.distance < 1000">
-          {{ unit_length(telemetry.navigation.distance, 'm') }}</span
-        >
-        <span v-else>{{ unit_length(telemetry.navigation.distance) }}</span>
+        <span v-if="telemetry2.navigation.hasAnActiveNavigation">{{
+          $t('N/A')
+        }}</span>
+        <span v-else> {{ telemetry2.navigation.distanceToTargetString }}</span>
       </li>
-      <li :class="{ disabled: !$hasJob() }" class="default">
+      <li :class="{ disabled: !telemetry2.job.hasAnActiveJob }" class="default">
         <div class="round">
           <i class="icon-weight" />
         </div>
-        <span v-if="!$hasJob()">{{ $t('N/A') }}</span>
-        <span v-else>{{ unit_weight(telemetry.job.cargo.mass) }}</span>
+        <span v-if="!telemetry2.job.hasAnActiveJob">{{ $t('N/A') }}</span>
+        <span v-else>{{ telemetry2.job.cargoWeightString }} </span>
       </li>
     </ul>
-
-    <!--<div class="info list">
-			<div><b>Expected:</b><span>{{formatDeliveryTime()}}</span></div>
-			<div><b>Destination:</b><span>{{telemetry.job.destination.city.name}} - {{telemetry.job.destination.company.name}}</span></div>
-			<div><b>Source:</b><span>{{telemetry.job.source.city.name}} - {{telemetry.job.source.company.name}}</span></div>
-			<div><b>Market:</b><span>{{market.name}}</span></div>
-			<div><b>Income:</b><span>{{unit_currency( telemetry.job.income )}}</span></div>
-			<div><b>Special transport:</b><span>{{isSpecial ? 'YES' : 'NO'}}</span></div>
-			<div><b>Planned telemetry.navigation.distance:</b><span>{{plannedDistance.km}}km / {{plannedDistance.miles}}Miles</span></div>
-		</div>
-		
-		<div class="telemetry.job.cargo list">
-			<div><b>Name:</b><span>{{telemetry.job.cargo.name}}</span></div>
-			<div><b>Mass:</b><span>{{(telemetry.job.cargo.mass / 1000).toFixed()}}t</span></div>
-			<div><b>Unit Mass:</b><span>{{(telemetry.job.cargo.unitMass / 1000).toFixed()}}t</span></div>
-			<div><b>Damage:</b><span>{{Math.floor(100 * telemetry.job.cargo.damage)}}%</span></div>
-			<div><b>Loaded:</b><span>{{telemetry.job.cargo.isLoaded ? 'YES' : 'NO'}}</span></div>
-		</div>-->
   </div>
 </template>
 
diff --git a/src/components/dashboards/jagfx/Zone/JagfxNavigation.vue b/src/components/dashboards/jagfx/Zone/JagfxNavigation.vue
index be3de19f..6149726e 100644
--- a/src/components/dashboards/jagfx/Zone/JagfxNavigation.vue
+++ b/src/components/dashboards/jagfx/Zone/JagfxNavigation.vue
@@ -5,13 +5,8 @@
         <!-- Left elements -->
         <JagfxSymbolArea side="left" />
 
-        <div
-          :class="telemetry.truck.transmission.shifterType"
-          class="truck-gear"
-        >
-          <span class="value">{{
-            $trukGear(telemetry.truck.transmission, telemetry.truck.brand)
-          }}</span>
+        <div :class="telemetry2.truck.shifterType" class="truck-gear">
+          <span class="value">{{ telemetry2.truck.gearDisplayed }}</span>
         </div>
 
         <!-- Right elements -->
@@ -30,20 +25,17 @@
           >
             <JagfxRPMBars
               v-bind="{
-                engine: telemetry.truck.engine,
-                brand: telemetry.truck.brand,
-                model: telemetry.truck.model
+                engineRpm: telemetry2.truck.rpm,
+                engineMaxRpm: telemetry2.truck.maxRpm,
+                brandId: telemetry2.truck.brandId,
+                modelId: telemetry2.truck.modelId
               }"
             />
           </div>
           <div class="middle">
             <div class="speed">
-              <span class="value">{{
-                $toFixed(unit_speed(telemetry.truck.speed, true, false), 0)
-              }}</span>
-              <small class="unit">{{
-                unit_speed(telemetry.truck.speed, false)
-              }}</small>
+              <span class="value">{{ telemetry2.truck.speed.toFixed(0) }}</span>
+              <small class="unit">{{ $unitReadable('unit_speed') }}</small>
             </div>
 
             <div
@@ -74,9 +66,10 @@
           >
             <JagfxRPMBars
               v-bind="{
-                engine: telemetry.truck.engine,
-                brand: telemetry.truck.brand,
-                model: telemetry.truck.model
+                engineRpm: telemetry2.truck.rpm,
+                engineMaxRpm: telemetry2.truck.maxRpm,
+                brandId: telemetry2.truck.brandId,
+                modelId: telemetry2.truck.modelId
               }"
             />
           </div>
@@ -84,12 +77,8 @@
       </div>
 
       <div class="odometer">
-        <span class="value">{{
-          $toFixed(unit_length(telemetry.truck.odometer, 'km', true, false), 0)
-        }}</span>
-        <small class="unit">{{
-          unit_length(telemetry.truck.odometer, 'km', false)
-        }}</small>
+        <span class="value">{{ telemetry2.truck.odometer.toFixed(0) }}</span>
+        <small class="unit">{{ $unitReadable('unit_length', 'km') }}</small>
       </div>
 
       <!-- Speed limit -->
@@ -101,7 +90,7 @@
               'jagfx_elements_mid_bottom_blinker_turn'
             )
           "
-          :class="{ active: telemetry.truck.lights.blinker.left.active }"
+          :class="{ active: telemetry2.symbols.leftDirectionIsActive }"
           class="blinkers"
         >
           <i class="icon-blinker_left" />
@@ -113,10 +102,10 @@
               'jagfx_elements_mid_bottom_speedLimit'
             )
           "
-          :class="{ hidden: telemetry.navigation.speedLimit.value === 0 }"
+          :class="{ hidden: !telemetry2.navigation.hasAnActiveSpeedLimit }"
           class="speedLimitKPH"
         >
-          {{ unit_speed(telemetry.navigation.speedLimit, true, false) }}
+          {{ telemetry2.navigation.speedLimitValue.toFixed(0) }}
         </div>
         <div
           v-if="
@@ -125,7 +114,7 @@
               'jagfx_elements_mid_bottom_blinker_turn'
             )
           "
-          :class="{ active: telemetry.truck.lights.blinker.right.active }"
+          :class="{ active: telemetry2.symbols.rightDirectionIsActive }"
           class="blinkers"
         >
           <i class="icon-blinker_right" />
@@ -148,13 +137,12 @@ export default {
   methods: {
     getFuelByBar: function () {
       return (
-        this.telemetry.truck.fuel.capacity *
-        this.telemetry.truck.fuel.warning.factor
+        this.telemetry2.truck.fuelCapacity * this.telemetry2.truck.fuelFactor
       ).toFixed(0);
     },
     getFuelBarCount: function () {
       return Math.ceil(
-        this.telemetry.truck.fuel.capacity / this.getFuelByBar()
+        this.telemetry2.truck.fuelCapacity / this.getFuelByBar()
       );
     },
     getFuelBarActive: function (i) {
@@ -162,10 +150,10 @@ export default {
       const iLow = i - 1;
       const fuelBarFrom = iLow * fuelByBar;
 
-      return this.telemetry.truck.fuel.value >= fuelBarFrom;
+      return this.telemetry2.truck.fuelLevel >= fuelBarFrom;
     },
     onWarningLevel: function () {
-      return this.telemetry.truck.fuel.value < this.getFuelByBar();
+      return this.telemetry2.truck.fuelLevel < this.getFuelByBar();
     }
   }
 };
diff --git a/src/components/dashboards/jagfx/Zone/JagfxRPMBars.vue b/src/components/dashboards/jagfx/Zone/JagfxRPMBars.vue
index 35ee91fa..173dafaf 100644
--- a/src/components/dashboards/jagfx/Zone/JagfxRPMBars.vue
+++ b/src/components/dashboards/jagfx/Zone/JagfxRPMBars.vue
@@ -21,16 +21,20 @@ import jq from 'json-query';
 export default {
   name: 'JagfxRPMBars',
   props: {
-    brand: {
-      type: Object,
+    brandId: {
+      type: String,
       required: true
     },
-    engine: {
-      type: Object,
+    engineRpm: {
+      type: Number,
       required: true
     },
-    model: {
-      type: Object,
+    engineMaxRpm: {
+      type: Number,
+      required: true
+    },
+    modelId: {
+      type: String,
       required: true
     }
   },
@@ -41,21 +45,19 @@ export default {
     };
   },
   mounted() {
-    if (this.brand !== undefined || this.model !== undefined) {
-      const ter = JSON.parse(JSON.stringify(truck_engine_rpm));
-      this.ter = jq(
-        `trucks[brandId=${this.brand.id}].models[modelId=${this.model.id}]`,
-        { data: ter }
-      ).value;
+    const ter = JSON.parse(JSON.stringify(truck_engine_rpm));
+    this.ter = jq(
+      `trucks[brandId=${this.brandId.id}].models[modelId=${this.modelId.id}]`,
+      { data: ter }
+    ).value;
 
-      if (this.ter === null) {
-        this.ter = {
-          max: 2500,
-          low: null,
-          mid: null,
-          high: null
-        };
-      }
+    if (this.ter === null) {
+      this.ter = {
+        max: 2500,
+        low: null,
+        mid: null,
+        high: null
+      };
     }
   },
   methods: {
@@ -64,13 +66,13 @@ export default {
 
       const rpmBarFrom = this.getCurrentRpmBar(i);
 
-      return this.engine.rpm.value >= rpmBarFrom && this.engine.rpm.value !== 0;
+      return this.engineRpm >= rpmBarFrom && this.engineRpm !== 0;
     },
     getCurrentRpmBar: function (i) {
       if (this.ter === null) return 0;
 
       const maxBar = this.maxBarRpm;
-      const rpmByBar = this.engine.rpm.max / maxBar;
+      const rpmByBar = this.engineMaxRpm / maxBar;
       const iLow = maxBar - i;
 
       return iLow * rpmByBar;
diff --git a/src/components/dashboards/jagfx/Zone/JagfxTrailer.vue b/src/components/dashboards/jagfx/Zone/JagfxTrailer.vue
index e998298b..6d1daa06 100644
--- a/src/components/dashboards/jagfx/Zone/JagfxTrailer.vue
+++ b/src/components/dashboards/jagfx/Zone/JagfxTrailer.vue
@@ -4,10 +4,13 @@
       <div class="trailer-data">
         <!--<span>{{bodyType}}</span>
 				<small>{{chainType}}</small>-->
-        <div v-if="$hasTrailerAndJob()" class="job">
-          {{ telemetry.job.cargo.name }}
+        <div
+          v-if="telemetry2.job.hasAnActiveJob && telemetry2.trailer.hasATrailer"
+          class="job"
+        >
+          {{ telemetry2.job.cargoName }}
         </div>
-        <div v-else-if="$hasTrailer()" class="job disabled">
+        <div v-else-if="telemetry2.trailer.hasATrailer" class="job disabled">
           <i>-- {{ $t('No Job') }} --</i>
         </div>
         <div v-else class="job disabled">
@@ -17,19 +20,14 @@
       <div class="job-data">
         <small class="licencePlate left">
           <span class="flag">
-            {{
-              $flag(
-                telemetry.trailer.licensePlate.country.id,
-                telemetry.game.game.id
-              )
-            }}
+            {{ telemetry2.trailer.countryFlagOfLicensePlate }}
           </span>
-          <span v-if="$hasTrailer()" class="w-100 text-center">
-            <span>{{ telemetry.trailer.licensePlate.value }}</span>
+          <span v-if="telemetry2.trailer.hasATrailer" class="w-100 text-center">
+            <span>{{ telemetry2.trailer.licensePlate }}</span>
           </span>
           <span v-else class="w-100 text-center">{{ $t('N/A') }}</span>
         </small>
-        <div v-if="$hasTrailer()" class="damage left">
+        <div v-if="telemetry2.trailer.hasATrailer" class="damage left">
           {{ $trailerDamage() }} %
         </div>
         <div v-else class="damage left">
diff --git a/src/components/dashboards/jagfx/Zone/JagfxTruck.vue b/src/components/dashboards/jagfx/Zone/JagfxTruck.vue
index e03abdfa..2c27a754 100644
--- a/src/components/dashboards/jagfx/Zone/JagfxTruck.vue
+++ b/src/components/dashboards/jagfx/Zone/JagfxTruck.vue
@@ -7,7 +7,7 @@
           <!--					<img alt="" class="brand" v-bind:src="`img/Truck/brands/${brand.id}.svg`">-->
           <!--<img src="../assets/Truck/brands/volvo.svg" class="brand" alt="">-->
           <small>
-            <span>{{ telemetry.truck.model.name }}</span>
+            <span>{{ telemetry2.truck.modelName }}</span>
           </small>
           <!--<span>
             {{unit_consumption( telemetry.truck.fuel.avgConsumption )}} l/100
@@ -20,15 +20,10 @@
           <span>
             <span class="licencePlate right">
               <span class="flag">
-                {{
-                  $flag(
-                    telemetry.truck.licensePlate.country.id,
-                    telemetry.game.game.id
-                  )
-                }}
+                {{ telemetry2.truck.countryFlagOfLicensePlate }}
               </span>
               <span class="w-100 text-center">
-                <span>{{ telemetry.truck.licensePlate.value }}</span>
+                <span>{{ telemetry2.truck.licensePlate }}</span>
               </span>
             </span>
           </span>
@@ -56,16 +51,17 @@
       <li
         v-if="elementIsEnabled('jagfx_elements_right_cruiseControl')"
         :class="{
-          green: telemetry.truck.cruiseControl.enabled,
-          disabled: !telemetry.truck.cruiseControl.enabled
+          green: telemetry2.truck.cruiseControlIsEnabled,
+          disabled: !telemetry2.truck.cruiseControlIsEnabled
         }"
       >
-        <span v-show="!telemetry.truck.cruiseControl.enabled">{{
+        <span v-show="!telemetry2.truck.cruiseControlIsEnabled">{{
           $t('OFF')
         }}</span>
-        <span v-show="telemetry.truck.cruiseControl.enabled">{{
-          unit_speed(telemetry.truck.cruiseControl)
-        }}</span>
+        <span v-show="telemetry2.truck.cruiseControlIsEnabled">
+          {{ telemetry2.truck.cruiseControlSpeed }}
+          {{ $unitReadable('unit_speed') }}
+        </span>
         <div class="round">
           <i class="icon-cruise_control" />
         </div>
@@ -76,10 +72,13 @@
         v-if="elementIsEnabled('jagfx_elements_right_fuel')"
         class="blue"
         :class="{
-          orange: telemetry.truck.fuel.warning.enabled
+          orange: telemetry2.symbols.fuelLevelIsLow
         }"
       >
-        <span>{{ unit_volume(telemetry.truck.fuel.value) }}</span>
+        <span>
+          {{ telemetry2.truck.fuelLevel.toFixed(0) }}
+          {{ $unitReadable('unit_volume') }}
+        </span>
         <div class="round">
           <i class="icon-fuel" />
         </div>
@@ -90,7 +89,10 @@
         v-if="elementIsEnabled('jagfx_elements_right_fuelConsumption')"
         class="white"
       >
-        <span>{{ unit_consumption(telemetry.truck.fuel.avgConsumption) }}</span>
+        <span>
+          {{ telemetry2.truck.fuelAverageConsumption }}
+          {{ $unitReadable('unit_consumption') }}
+        </span>
         <div class="round">
           <i class="icon-fuel_consumption" />
         </div>
@@ -101,7 +103,9 @@
         v-if="elementIsEnabled('jagfx_elements_right_restStop')"
         class="default"
       >
-        <span>in {{ $nextRestStop(telemetry.navigation.nextRestStop) }}</span>
+        <span>
+          in {{ $nextRestStop(telemetry2.navigation.nextRestStopTime) }}
+        </span>
         <div class="round">
           <i class="icon-rest_stop" />
         </div>
@@ -112,13 +116,14 @@
         v-if="elementIsEnabled('jagfx_elements_right_brakesAirPressure')"
         class="blue"
         :class="{
-          orange: telemetry.truck.brakes.airPressure.warning.enabled,
-          red: telemetry.truck.brakes.airPressure.emergency.enabled
+          orange: telemetry2.symbols.brakePressureIsLow,
+          red: telemetry2.symbols.brakePressureIsCriticalLow
         }"
       >
-        <span>{{
-          unit_pressure(telemetry.truck.brakes.airPressure.value)
-        }}</span>
+        <span>
+          {{ telemetry2.truck.brakeAirPressure.toFixed(0) }}
+          {{ $unitReadable('unit_pressure') }}
+        </span>
         <div class="round">
           <i class="icon-air_pressure" />
         </div>
@@ -129,9 +134,10 @@
         v-if="elementIsEnabled('jagfx_elements_right_oilTemperature')"
         class="default"
       >
-        <span>{{
-          unit_degrees(telemetry.truck.engine.oilTemperature.value)
-        }}</span>
+        <span>
+          {{ telemetry2.truck.engineOilTemperature.toFixed(1) }}
+          {{ $unitReadable('unit_degrees') }}
+        </span>
         <div class="round">
           <i class="icon-oil" />
         </div>
@@ -142,9 +148,10 @@
         v-if="elementIsEnabled('jagfx_elements_right_brakesTemperature')"
         class="white"
       >
-        <span>{{
-          unit_degrees(telemetry.truck.brakes.temperature.value)
-        }}</span>
+        <span>
+          {{ telemetry2.truck.brakeTemperature.toFixed(1) }}
+          {{ $unitReadable('unit_degrees') }}
+        </span>
         <div class="round">
           <i class="icon-brakes_temperature" />
         </div>
@@ -155,12 +162,13 @@
         v-if="elementIsEnabled('jagfx_elements_right_waterTemperature')"
         class="blue"
         :class="{
-          orange: telemetry.truck.engine.waterTemperature.warning.enabled
+          orange: telemetry2.symbols.engineWaterTemperatureIsHot
         }"
       >
-        <span>{{
-          unit_degrees(telemetry.truck.engine.waterTemperature.value)
-        }}</span>
+        <span>
+          {{ telemetry2.truck.engineWaterTemperature.toFixed(1) }}
+          {{ $unitReadable('unit_degrees') }}
+        </span>
         <div class="round">
           <i class="icon-water_temperature" />
         </div>
@@ -171,12 +179,10 @@
         v-if="elementIsEnabled('jagfx_elements_right_batteryVoltage')"
         class="blue"
         :class="{
-          orange: telemetry.truck.engine.batteryVoltage.warning.enabled
+          orange: telemetry2.symbols.batteryVoltageIdLow
         }"
       >
-        <span
-          >{{ Math.round(telemetry.truck.engine.batteryVoltage.value) }} V</span
-        >
+        <span>{{ Math.round(telemetry2.truck.batteryVoltage) }} V</span>
         <div class="round">
           <i class="icon-battery" />
         </div>
diff --git a/src/components/dashboards/scania/ScaniaGauges.vue b/src/components/dashboards/scania/ScaniaGauges.vue
index 04e36bd2..b5f5e5f4 100644
--- a/src/components/dashboards/scania/ScaniaGauges.vue
+++ b/src/components/dashboards/scania/ScaniaGauges.vue
@@ -4,9 +4,9 @@
       v-bind="{
         classCSS: 'truck-speed',
         type: 'meter',
-        value: unit_speed(telemetry.truck.speed, true, false),
-        min: $speedUnitReadable({ kph: 10, mph: 10 }),
-        max: $speedUnitReadable({ kph: 130, mph: 130 }),
+        value: telemetry2.truck.speed,
+        min: 2.77778,
+        max: 36.1111,
         minAngle: -122,
         maxAngle: 123
       }"
@@ -15,7 +15,7 @@
       v-bind="{
         classCSS: 'truck-engineRpm',
         type: 'meter',
-        value: telemetry.truck.engine.rpm.value / 100,
+        value: telemetry2.truck.rpm / 100,
         min: 3,
         max: 27,
         minAngle: -122,
@@ -26,9 +26,9 @@
       v-bind="{
         classCSS: 'truck-fuel',
         type: 'meter',
-        value: telemetry.truck.fuel.value,
+        value: telemetry2.truck.fuelLevel,
         min: 0,
-        max: telemetry.truck.fuel.capacity,
+        max: telemetry2.truck.fuelCapacity,
         minAngle: -53,
         maxAngle: 53
       }"
@@ -37,7 +37,7 @@
       v-bind="{
         classCSS: 'truck-waterTemperature',
         type: 'meter',
-        value: telemetry.truck.engine.waterTemperature.value,
+        value: telemetry2.truck.engineWaterTemperature,
         min: 40,
         max: 100,
         minAngle: -55,
@@ -48,13 +48,9 @@
       v-bind="{
         classCSS: 'truck-oilPressure',
         type: 'meter',
-        value: unit_pressure(
-          telemetry.truck.engine.oilPressure.value,
-          true,
-          false
-        ),
+        value: telemetry2.truck.oilPressure,
         min: 0,
-        max: $pressureUnitReadable(116),
+        max: 116,
         minAngle: -53,
         maxAngle: 53
       }"
@@ -63,11 +59,7 @@
       v-bind="{
         classCSS: 'truck-fuelAverageConsumption',
         type: 'meter',
-        value: unit_consumption(
-          telemetry.truck.fuel.avgConsumption,
-          true,
-          false
-        ),
+        value: telemetry2.truck.fuelAverageConsumption,
         min: 0,
         max: 120,
         minAngle: -56,
diff --git a/src/components/dashboards/scania/display/ScaniaDisplay.vue b/src/components/dashboards/scania/display/ScaniaDisplay.vue
index 7444f230..5132ecad 100644
--- a/src/components/dashboards/scania/display/ScaniaDisplay.vue
+++ b/src/components/dashboards/scania/display/ScaniaDisplay.vue
@@ -4,26 +4,22 @@
     <div class="gearbox-info d-flex justify-content-between align-items-center">
       <div class="flex-area justify-content-start w-100 gearbox-wrapper">
         <div class="truck-shifterType flex-area">
-          <span>{{
-            $truckShifterTypeLetter(telemetry.truck.transmission)
-          }}</span>
+          <span>{{ telemetry2.truck.shifterTypeLetter }}</span>
         </div>
         <div class="truck-gear flex-area">
           <span>
-            {{
-              $trukGear(
-                telemetry.truck.transmission,
-                telemetry.truck.brand,
-                false
-              )
-            }}
+            {{ telemetry2.truck.gearDisplayedWithoutShifterType }}
           </span>
         </div>
       </div>
       <div class="datetime flex-area">
         <span>
           {{
-            $dateTimeLocalized($gameTime(), DATE_FORMAT_NONE, TIME_FORMAT_TINY)
+            $dateTimeLocalized(
+              telemetry2.gameTime,
+              DATE_FORMAT_NONE,
+              TIME_FORMAT_TINY
+            )
           }}
         </span>
       </div>
@@ -42,14 +38,12 @@
           class="d-flex justify-content-center align-items-center flex-column px-3"
         >
           <span
-            v-if="telemetry.truck.cruiseControl.enabled"
+            v-if="telemetry2.truck.cruiseControlIsEnabled"
             class="value pb-2"
-            >{{ unit_speed(telemetry.truck.cruiseControl, true, false) }}</span
+            >{{ telemetry2.truck.cruiseControlSpeed }}</span
           >
           <span v-else class="value pb-2">-</span>
-          <span class="unit">{{
-            unit_speed(telemetry.truck.cruiseControl, false, true)
-          }}</span>
+          <span class="unit">{{ $unitReadable('unit_speed') }}</span>
         </div>
       </div>
       <div class="item d-flex justify-content-center align-items-center">
@@ -60,9 +54,7 @@
           class="d-flex justify-content-center align-items-center flex-column px-3"
         >
           <span class="value pb-2">-</span>
-          <span class="unit">{{
-            unit_speed(telemetry.truck.cruiseControl, false, true)
-          }}</span>
+          <span class="unit">{{ $unitReadable('unit_speed') }}</span>
         </div>
       </div>
     </div>
@@ -86,7 +78,7 @@
       class="box-warning-symbol d-flex justify-content-start align-items-center w-100"
     >
       <div
-        v-if="telemetry.truck.fuel.warning.enabled"
+        v-if="telemetry2.symbols.fuelLevelIsLow"
         class="truck-fuelWarning flex-area item"
       >
         <i class="icon-scania-fuel_yellow" />
@@ -116,7 +108,7 @@
         >
           <!-- Rest time -->
           <div class="value">
-            {{ $nextRestStop(telemetry.navigation.nextRestStop, 'HH:mm') }}
+            {{ $nextRestStop(telemetry2.navigation.nextRestStopTime, 'HH:mm') }}
           </div>
           <div class="unit">h</div>
         </div>
@@ -129,12 +121,13 @@
       class="mileage d-flex justify-content-between align-items-center w-100"
     >
       <div class="truck-odometer flex-area justify-content-start">
-        <span class="pl-3">{{
-          unit_length(telemetry.truck.odometer, 'km')
-        }}</span>
+        <span class="pl-3">
+          {{ telemetry2.truck.odometer.toFixed(1) }}
+          {{ $unitReadable('unit_length', 'km') }}
+        </span>
       </div>
       <div class="temperature flex-area justify-content-end">
-        <span class="pr-3">-°{{ config('unit_degrees') }}</span>
+        <span class="pr-3">-{{ $unitReadable('unit_degrees') }}</span>
       </div>
     </div>
     <!-- </editor-folder> Mileage -->
diff --git a/src/components/dashboards/scania/display/menu/ScaniaDrivingAssistanceMenu.vue b/src/components/dashboards/scania/display/menu/ScaniaDrivingAssistanceMenu.vue
index e27fa0f2..49faadd6 100644
--- a/src/components/dashboards/scania/display/menu/ScaniaDrivingAssistanceMenu.vue
+++ b/src/components/dashboards/scania/display/menu/ScaniaDrivingAssistanceMenu.vue
@@ -11,7 +11,7 @@
       </div>
       <div class="flex-area">
         <div class="value">-</div>
-        <div class="unit">{{ unit_length(1, 'km', false, true) }}</div>
+        <div class="unit">{{ $unitReadable('unit_length', 'km') }}</div>
       </div>
     </div>
 
@@ -24,7 +24,7 @@
       </div>
       <div class="flex-area">
         <div class="value">-</div>
-        <div class="unit">{{ unit_speed(100, false, true) }}</div>
+        <div class="unit">{{ $unitReadable('unit_speed') }}</div>
       </div>
     </div>
 
@@ -37,18 +37,10 @@
       </div>
       <div class="flex-area">
         <div class="value">
-          {{
-            unit_consumption(
-              telemetry.truck.fuel.avgConsumption,
-              true,
-              false
-            ).toFixed(1)
-          }}
+          {{ telemetry2.truck.fuelAverageConsumption.toFixed(1) }}
         </div>
         <div class="unit">
-          {{
-            unit_consumption(telemetry.truck.fuel.avgConsumption, false, true)
-          }}
+          {{ $unitReadable('unit_consumption') }}
         </div>
       </div>
     </div>
diff --git a/src/components/dashboards/scania/display/menu/ScaniaInstantaneousDataMenu.vue b/src/components/dashboards/scania/display/menu/ScaniaInstantaneousDataMenu.vue
index d09082bf..261cdfb0 100644
--- a/src/components/dashboards/scania/display/menu/ScaniaInstantaneousDataMenu.vue
+++ b/src/components/dashboards/scania/display/menu/ScaniaInstantaneousDataMenu.vue
@@ -6,7 +6,7 @@
       v-bind="{
         min: 20,
         max: 36,
-        value: telemetry.truck.engine.batteryVoltage.value,
+        value: telemetry2.truck.batteryVoltage,
         unit: 'V',
         displayMidLabel: false
       }"
@@ -16,13 +16,9 @@
     <ScaniaBar
       v-bind="{
         min: 0,
-        max: $pressureUnitReadable(175),
-        value: unit_pressure(
-          telemetry.truck.brakes.airPressure.value,
-          true,
-          false
-        ),
-        unit: unit_pressure(1, false, true)
+        max: 175,
+        value: telemetry2.truck.brakeAirPressure,
+        unit: $unitReadable('unit_pressure')
       }"
     >
       <i class="icon icon-scania-parking-break_red" />
@@ -32,8 +28,8 @@
         min: 0,
         max: 100,
         value:
-          (telemetry.truck.adBlue.value * 100) /
-          telemetry.truck.adBlue.capacity,
+          (telemetry2.truck.adBlueLevel * 100) /
+          telemetry2.truck.adBlueCapacity,
         unit: '%'
       }"
     >
diff --git a/src/components/dashboards/scania/symbols/ScaniaBodybuilderSymbols.vue b/src/components/dashboards/scania/symbols/ScaniaBodybuilderSymbols.vue
index 1d2ad038..7bb7ba3f 100644
--- a/src/components/dashboards/scania/symbols/ScaniaBodybuilderSymbols.vue
+++ b/src/components/dashboards/scania/symbols/ScaniaBodybuilderSymbols.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div
-      v-if="telemetry.truck.lights.beacon.enabled"
+      v-if="telemetry2.symbols.beaconIsEnabled"
       class="rotating-light flex-area symbol"
     >
       <i class="icon-scania-rotating-beacon_blue" />
diff --git a/src/components/dashboards/scania/symbols/ScaniaGeneralWarningSymbols.vue b/src/components/dashboards/scania/symbols/ScaniaGeneralWarningSymbols.vue
index 9b5e73f8..d5ac86bb 100644
--- a/src/components/dashboards/scania/symbols/ScaniaGeneralWarningSymbols.vue
+++ b/src/components/dashboards/scania/symbols/ScaniaGeneralWarningSymbols.vue
@@ -1,19 +1,19 @@
 <template>
   <div>
     <div
-      v-if="telemetry.truck.lights.blinker.left.active"
+      v-if="telemetry2.symbols.leftDirectionIsActive"
       class="truck-blinkerLeft flex-area"
     >
       <i class="icon-scania-direction-indicator-left_green" />
     </div>
     <div
-      v-if="telemetry.truck.lights.blinker.right.active"
+      v-if="telemetry2.symbols.rightDirectionIsActive"
       class="truck-blinkerRight flex-area"
     >
       <i class="icon-scania-direction-indicator-right_green" />
     </div>
     <div
-      v-if="telemetry.truck.lights.beamHigh.enabled"
+      v-if="telemetry2.symbols.mainBeamIsEnabled"
       class="truck-lightsBeamHigh flex-area symbol"
     >
       <i class="icon-scania-main-beam_blue" />
diff --git a/src/components/dashboards/scania/symbols/ScaniaIndicatorSymbols.vue b/src/components/dashboards/scania/symbols/ScaniaIndicatorSymbols.vue
index 55b708d0..13fce142 100644
--- a/src/components/dashboards/scania/symbols/ScaniaIndicatorSymbols.vue
+++ b/src/components/dashboards/scania/symbols/ScaniaIndicatorSymbols.vue
@@ -2,13 +2,13 @@
   <div>
     <!-- Line 1 -->
     <div
-      v-if="$hasErrors() || $truckElectricOn"
+      v-if="telemetry2.truck.hasErrors || $truckElectricOn"
       class="truck-stopWarning flex-area symbol r1 c1 red"
     >
       <i class="icon-scania-warning_red" />
     </div>
     <div
-      v-if="$hasWarnings() || $truckElectricOn"
+      v-if="telemetry2.truck.hasWarnings || $truckElectricOn"
       class="truck-checkWarning flex-area symbol r1 c2 yellow"
     >
       <i class="icon-scania-warning_yellow" />
@@ -16,27 +16,19 @@
 
     <!-- Line 2 -->
     <div
-      v-if="
-        telemetry.truck.brakes.airPressure.warning.enabled ||
-        telemetry.truck.brakes.airPressure.emergency.enabled ||
-        $truckElectricOn
-      "
+      v-if="telemetry2.symbols.brakePressureIsActive || $truckElectricOn"
       class="truck-brake-pressure flex-area symbol r2 c1 red"
     >
       <i class="icon-scania-break-pressure_red_yellow" />
     </div>
     <div
-      v-if="
-        (telemetry.truck.brakes.parking.enabled &&
-          telemetry.truck.electric.enabled) ||
-        $truckElectricOn
-      "
+      v-if="telemetry2.symbols.parkingBrakeIsEnabled || $truckElectricOn"
       class="truck-parkBrake flex-area symbol r2 c2 red"
     >
       <i class="icon-scania-parking-break_red" />
     </div>
     <div
-      v-if="telemetry.truck.brakes.retarder.level > 0 || $truckElectricOn"
+      v-if="telemetry2.symbols.retarderIsActive || $truckElectricOn"
       class="retarder flex-area symbol r2 c4 green"
     >
       <i class="icon-scania-retarder_green" />
@@ -44,13 +36,13 @@
 
     <!-- Line 3 -->
     <div
-      v-if="$hasEngineWarning() || $truckElectricOn"
+      v-if="telemetry2.truck.hasEngineWarning || $truckElectricOn"
       class="engine-failure flex-area symbol r3 c2 yellow"
     >
       <i class="icon-scania-engine-failure_yellow" />
     </div>
     <div
-      v-if="telemetry.truck.differential.lock.enabled || $truckElectricOn"
+      v-if="telemetry2.symbols.differentialIsLocked || $truckElectricOn"
       class="truck-differentialLock flex-area symbol r3 c4 yellow"
     >
       <i class="icon-scania-differential-lock_yellow" />
@@ -64,13 +56,13 @@
       <i class="icon-scania-driver-safty-belt_red" />
     </div>
     <div
-      v-if="telemetry.truck.liftAxle.enabled || $truckElectricOn"
+      v-if="telemetry2.symbols.truckLiftAxleIsEnabled || $truckElectricOn"
       class="tractor-tag-axle-raised flex-area symbol r4 c3 yellow"
     >
       <i class="icon-scania-tractor-tag-axle-raised_yellow" />
     </div>
     <div
-      v-if="telemetry.trailer.liftAxle.enabled || $truckElectricOn"
+      v-if="telemetry2.symbols.trailerLiftAxleIsEnabled || $truckElectricOn"
       class="trailer-tag-axle-raised flex-area symbol r4 c4 yellow"
     >
       <i class="icon-scania-trailer-tag-axle-raised_yellow" />
diff --git a/src/components/dashboards/shared/Map.vue b/src/components/dashboards/shared/Map.vue
index 6c7fe32e..eb41edc5 100644
--- a/src/components/dashboards/shared/Map.vue
+++ b/src/components/dashboards/shared/Map.vue
@@ -33,8 +33,12 @@
           v-if="!embedded"
           class="barButton mr-auto h-100 menuRoute"
           :class="{
-            disabled: !$haveAnActiveNavigation() || !displayNavigationInfo,
-            active: $haveAnActiveNavigation() && displayNavigationInfo
+            disabled:
+              !telemetry2.navigation.hasAnActiveNavigation ||
+              !displayNavigationInfo,
+            active:
+              telemetry2.navigation.hasAnActiveNavigation &&
+              displayNavigationInfo
           }"
           @click="displayNavigationInfo = !displayNavigationInfo"
         >
@@ -68,7 +72,7 @@
         >
           <div class="speed">
             <span class="value d-block">{{
-              $toFixed(unit_speed(telemetry.truck.speed, true, false), 0)
+              unit_speed(telemetry.truck.speed, true, false).toFixed(0)
             }}</span>
           </div>
 
@@ -76,7 +80,7 @@
             :class="telemetry.truck.transmission.shifterType"
             class="truck-gears ml-2"
           >
-            {{ $trukGear(telemetry.truck.transmission, telemetry.truck.brand) }}
+            telemetry2.truck.gearDisplayed
           </div>
         </div>
       </div>
@@ -111,7 +115,7 @@
     <!-- Speed limit -->
     <div
       v-if="
-        $haveAnActiveSpeedLimit() &&
+        telemetry2.navigation.hasAnActiveSpeedLimit &&
         configEnabled('maps_elements_speedLimit') &&
         !embedded
       "
@@ -210,7 +214,11 @@
 
     <!-- Navigation ETA -->
     <div
-      v-if="$haveAnActiveNavigation() && displayNavigationInfo && !embedded"
+      v-if="
+        telemetry2.navigation.hasAnActiveNavigation &&
+        displayNavigationInfo &&
+        !embedded
+      "
       class="eta-wrapper d-flex justify-content-end align-items-start flex-column"
     >
       <div
@@ -221,14 +229,20 @@
           <i class="icon-time" />
         </div>
         <span class="pl-2 w-100">{{
-          $dateTimeLocalized($etaDueDate(), DATE_FORMAT_LONG, TIME_FORMAT_SHORT)
+          $dateTimeLocalized(
+            telemetry2.navigation.etaDueDate,
+            DATE_FORMAT_LONG,
+            TIME_FORMAT_SHORT
+          )
         }}</span>
       </div>
       <div v-else class="button px-2 py-0 w-100 active">
         <div class="round">
           <i class="icon-time" />
         </div>
-        <span class="pl-2 w-100">{{ $etaRemaing() }}</span>
+        <span class="pl-2 w-100">{{
+          telemetry2.navigation.etaRemainingTime
+        }}</span>
       </div>
       <span class="button px-2 py-0 w-100 active">
         <div class="round">
diff --git a/src/components/header/HeaderGameInformation.vue b/src/components/header/HeaderGameInformation.vue
index 12787662..a31101cd 100644
--- a/src/components/header/HeaderGameInformation.vue
+++ b/src/components/header/HeaderGameInformation.vue
@@ -114,7 +114,11 @@
     </ul>
     <div class="game-time">
       <span>{{
-        $dateTimeLocalized($gameTime(), DATE_FORMAT_LONG, TIME_FORMAT_SHORT)
+        $dateTimeLocalized(
+          telemetry2.gameTime,
+          DATE_FORMAT_LONG,
+          TIME_FORMAT_SHORT
+        )
       }}</span>
     </div>
     <ul class="w-100">
diff --git a/src/components/overlays/telemetry-event/TelemetryEventTrailersDamageOverlay.vue b/src/components/overlays/telemetry-event/TelemetryEventTrailersDamageOverlay.vue
index bcf6df41..e56cb594 100644
--- a/src/components/overlays/telemetry-event/TelemetryEventTrailersDamageOverlay.vue
+++ b/src/components/overlays/telemetry-event/TelemetryEventTrailersDamageOverlay.vue
@@ -7,7 +7,7 @@
       >
         <span class="title">{{ $t('Cargo') }}</span>
         <span class="data"
-          >{{ $toFixed(eventRawData.data.cargo * 100, 2) }} %</span
+          >{{ (eventRawData.data.cargo * 100).toFixed(2) }} %</span
         >
       </div>
       <div
@@ -15,7 +15,7 @@
       >
         <span class="title">{{ $t('Frame') }}</span>
         <span class="data"
-          >{{ $toFixed(eventRawData.data.chassis * 100, 2) }} %</span
+          >{{ (eventRawData.data.chassis * 100).toFixed(2) }} %</span
         >
       </div>
     </div>
diff --git a/src/components/overlays/telemetry-event/TelemetryEventTruckDamageOverlay.vue b/src/components/overlays/telemetry-event/TelemetryEventTruckDamageOverlay.vue
index c3e71f2e..f5b11482 100644
--- a/src/components/overlays/telemetry-event/TelemetryEventTruckDamageOverlay.vue
+++ b/src/components/overlays/telemetry-event/TelemetryEventTruckDamageOverlay.vue
@@ -7,7 +7,7 @@
       >
         <span class="title">Cabin</span>
         <span class="data"
-          >{{ $toFixed(eventRawData.damages.cabin * 100, 2) }} %</span
+          >{{ (eventRawData.damages.cabin * 100).toFixed(2) }} %</span
         >
       </div>
       <div
@@ -15,7 +15,7 @@
       >
         <span class="title">Chassis</span>
         <span class="data"
-          >{{ $toFixed(eventRawData.damages.chassis * 100, 2) }} %</span
+          >{{ (eventRawData.damages.chassis * 100).toFixed(2) }} %</span
         >
       </div>
       <div
@@ -23,7 +23,7 @@
       >
         <span class="title">Engine</span>
         <span class="data"
-          >{{ $toFixed(eventRawData.damages.engine * 100, 2) }} %</span
+          >{{ (eventRawData.damages.engine * 100).toFixed(2) }} %</span
         >
       </div>
       <div
@@ -31,7 +31,7 @@
       >
         <span class="title">Transmission</span>
         <span class="data"
-          >{{ $toFixed(eventRawData.damages.transmission * 100, 2) }} %</span
+          >{{ (eventRawData.damages.transmission * 100).toFixed(2) }} %</span
         >
       </div>
       <div
@@ -39,7 +39,7 @@
       >
         <span class="title">Wheels</span>
         <span class="data"
-          >{{ $toFixed(eventRawData.damages.wheels * 100, 2) }} %</span
+          >{{ (eventRawData.damages.wheels * 100).toFixed(2) }} %</span
         >
       </div>
     </div>
diff --git a/src/mixins/TelemetryEventOverlayMixin.vue b/src/mixins/TelemetryEventOverlayMixin.vue
index 14c2c596..5652435d 100644
--- a/src/mixins/TelemetryEventOverlayMixin.vue
+++ b/src/mixins/TelemetryEventOverlayMixin.vue
@@ -1,10 +1,9 @@
 <script>
 import eventsText from '@/data/events.json';
-import TelemetryMixin from '@/mixins/TelemetryMixin';
 import { mapGetters } from 'vuex';
 
 export default {
-  mixins: [TelemetryMixin],
+  //mixins: [TelemetryMixin],
   computed: {
     ...mapGetters({
       eventProcessing: 'event/eventProcessing',
diff --git a/src/mixins/TelemetryMixin.vue b/src/mixins/TelemetryMixin.vue
index db1d97ee..32fe2822 100644
--- a/src/mixins/TelemetryMixin.vue
+++ b/src/mixins/TelemetryMixin.vue
@@ -1,38 +1,29 @@
 <script>
 import { store as telemetryStore } from '@/store/telemetry.store';
-import { dateTimeLocalized, formatConstants } from '@/utils/_app';
-import * as telemetryCommon from '@/utils/telemetry/_common.utils';
-import * as telemetryGear from '@/utils/telemetry/_grear.utils';
-import * as telemetryHelper from '@/utils/telemetry/_helper.utils';
-import * as telemetryJob from '@/utils/telemetry/_job.utils';
-import * as telemetryNavigation from '@/utils/telemetry/_navigation.utils';
-import * as telemetryTrailer from '@/utils/telemetry/_trailer.utils';
-import * as telemetryTruck from '@/utils/telemetry/_truck.utils';
+import {
+  dateTimeLocalized,
+  diffDateTimeLocalized,
+  formatConstants
+} from '@/utils/_app';
+import { config, telemetryDataIsEnough } from '@/utils/telemetry/_common.utils';
 import * as telemetryUnitConverter from '@/utils/telemetry/_unit-converter.utils';
 
 export default {
   name: 'TelemetryMixin',
-  filters: {
-    $dateTimeLocalized: (time, dFormat, tFormat) => {
-      return dateTimeLocalized(time, dFormat, tFormat);
-    },
-    $toFixed: (value, decimal) => {
-      return value.toFixed(decimal);
-    }
-  },
   data() {
     return {
       truckElectricOnValue: false,
-      truckElectricOnTimer: null
+      truckElectricOnTimer: null,
+      telemetry2: telemetryStore.model
     };
   },
   computed: {
+    /** @deprecated **/
     telemetry: () => telemetryStore.telemetry,
     receivedData: () => telemetryStore.receivedData,
     $truckElectricOn() {
       return this.truckElectricOnValue;
     }
-    //...telemetryGear,
   },
   watch: {
     'telemetry.truck.electric.enabled': function (newValue) {
@@ -54,13 +45,27 @@ export default {
     });
   },
   methods: {
-    ...telemetryCommon,
-    ...telemetryGear,
-    ...telemetryHelper,
-    ...telemetryJob,
-    ...telemetryNavigation,
-    ...telemetryTrailer,
-    ...telemetryTruck,
+    config: (name) => config(name),
+    $dateTimeLocalized: (time, dFormat, tFormat) => {
+      return dateTimeLocalized(time, dFormat, tFormat);
+    },
+    $nextRestStop: (time, customFormat) => {
+      return diffDateTimeLocalized(0, time, false, customFormat);
+    },
+    $telemetryDataIsEnough: () => telemetryDataIsEnough(),
+    $jobRemainingTimeToDueDate: () => {
+      return config('general_job_remaining') === 'due_date';
+    },
+    $trailerDamage: () => {
+      return config('general_damage_accurate') === 'damage-diagnostic'
+        ? telemetryStore.model.trailer.averageDamage
+        : Math.floor(telemetryStore.model.trailer.chassisDamage);
+    },
+    $truckDamage: () => {
+      return config('general_damage_accurate') === 'damage-diagnostic'
+        ? telemetryStore.model.truck.averageDamage
+        : Math.floor(telemetryStore.model.truck.chassisDamage);
+    },
     ...telemetryUnitConverter
   }
 };
diff --git a/src/model/telemetry-job.model.js b/src/model/telemetry-job.model.js
new file mode 100644
index 00000000..159510e2
--- /dev/null
+++ b/src/model/telemetry-job.model.js
@@ -0,0 +1,55 @@
+import { store as telemetryStore } from '@/store/telemetry.store';
+import { displayDuration } from '@/utils/_app';
+import {
+  unit_currency,
+  unit_weight
+} from '@/utils/telemetry/_unit-converter.utils';
+
+export default class TelemetryJob {
+  get expectedDeliveryTime() {
+    return telemetryStore.telemetry.job.market.id === 'external_contracts'
+      ? telemetryStore.telemetry.job.expectedDeliveryTimestamp.value
+      : telemetryStore.telemetry.job.expectedDeliveryTimestamp.unix;
+  }
+  get remainingDeliveryTime() {
+    const gameTime = telemetryStore.model.gameTime;
+    let diff = this.expectedDeliveryTime - gameTime;
+
+    return displayDuration(diff);
+  }
+  get hasAnActiveJob() {
+    return telemetryStore.telemetry.job.cargo.id.length !== 0;
+  }
+  get departureCityName() {
+    return this.hasAnActiveJob
+      ? telemetryStore.telemetry.job.source.city.name
+      : null;
+  }
+  get departureCompanyName() {
+    return this.hasAnActiveJob
+      ? telemetryStore.telemetry.job.source.company.name
+      : null;
+  }
+  get arrivalCityName() {
+    return telemetryStore.telemetry.job.destination.city.name;
+  }
+  get arrivalCompanyName() {
+    return telemetryStore.telemetry.job.destination.company.name;
+  }
+  get income() {
+    return unit_currency(
+      this.hasAnActiveJob ? telemetryStore.telemetry.job.income : 0,
+      true,
+      false
+    );
+  }
+  get cargoWeight() {
+    return unit_weight(telemetryStore.telemetry.job.cargo.mass, true, false);
+  }
+  get cargoWeightString() {
+    return unit_weight(telemetryStore.telemetry.job.cargo.mass);
+  }
+  get cargoName() {
+    return telemetryStore.telemetry.job.cargo.name;
+  }
+}
diff --git a/src/model/telemetry-navigation.model.js b/src/model/telemetry-navigation.model.js
new file mode 100644
index 00000000..80c09698
--- /dev/null
+++ b/src/model/telemetry-navigation.model.js
@@ -0,0 +1,47 @@
+import { store as telemetryStore } from '@/store/telemetry.store';
+import { diffDateTimeLocalized } from '@/utils/_app';
+import {
+  unit_length,
+  unit_speed
+} from '@/utils/telemetry/_unit-converter.utils';
+
+export default class TelemetryNavigation {
+  get nextRestStopTime() {
+    return telemetryStore.telemetry.navigation.nextRestStop;
+  }
+  get etaDueDate() {
+    return (
+      telemetryStore.telemetry.navigation.time +
+      telemetryStore.telemetry.game.time.unix
+    );
+  }
+  get etaRemainingTime() {
+    const currentGameTime = telemetryStore.model.gameTime;
+    const etaTime = this.etaDueDate;
+
+    return diffDateTimeLocalized(currentGameTime, etaTime);
+  }
+  get hasAnActiveNavigation() {
+    return telemetryStore.telemetry.navigation.distance > 0;
+  }
+  get hasAnActiveSpeedLimit() {
+    return telemetryStore.telemetry.navigation.speedLimit.value > 0;
+  }
+  get distanceToTargetValue() {
+    return telemetryStore.telemetry.navigation.distance;
+  }
+  get distanceToTargetString() {
+    return this.distanceToTargetValue < 1000
+      ? unit_length(this.distanceToTargetValue, 'm')
+      : unit_length(this.distanceToTargetValue);
+  }
+  get speedLimitValue() {
+    return this.hasAnActiveSpeedLimit
+      ? unit_speed(
+          telemetryStore.telemetry.navigation.speedLimit.value,
+          true,
+          false
+        )
+      : null;
+  }
+}
diff --git a/src/model/telemetry-symbols.model.js b/src/model/telemetry-symbols.model.js
new file mode 100644
index 00000000..778c962a
--- /dev/null
+++ b/src/model/telemetry-symbols.model.js
@@ -0,0 +1,63 @@
+import { store as telemetryStore } from '@/store/telemetry.store';
+
+export default class TelemetrySymbols {
+  get beaconIsEnabled() {
+    return telemetryStore.telemetry.truck.lights.beacon.enabled;
+  }
+  get leftDirectionIsActive() {
+    return telemetryStore.telemetry.truck.lights.blinker.left.active;
+  }
+  get rightDirectionIsActive() {
+    return telemetryStore.telemetry.truck.lights.blinker.right.active;
+  }
+  get mainBeamIsEnabled() {
+    return (
+      telemetryStore.telemetry.truck.lights.beamHigh.enabled &&
+      telemetryStore.telemetry.truck.lights.beamLow.enabled &&
+      telemetryStore.telemetry.truck.engine.enabled
+    );
+  }
+  get lowBeamIsEnabled() {
+    return (
+      telemetryStore.telemetry.truck.lights.beamLow.enabled &&
+      telemetryStore.telemetry.truck.engine.enabled
+    );
+  }
+  get brakePressureIsActive() {
+    return this.brakePressureIsLow || this.brakePressureIsCriticalLow;
+  }
+  get brakePressureIsLow() {
+    return telemetryStore.telemetry.truck.brakes.airPressure.warning.enabled;
+  }
+  get brakePressureIsCriticalLow() {
+    return telemetryStore.telemetry.truck.brakes.airPressure.emergency.enabled;
+  }
+  get parkingBrakeIsEnabled() {
+    return (
+      telemetryStore.telemetry.truck.brakes.parking.enabled &&
+      telemetryStore.telemetry.truck.electric.enabled
+    );
+  }
+  get retarderIsActive() {
+    return telemetryStore.telemetry.truck.brakes.retarder.level > 0;
+  }
+  get differentialIsLocked() {
+    return telemetryStore.telemetry.truck.differential.lock.enabled;
+  }
+  get truckLiftAxleIsEnabled() {
+    return telemetryStore.telemetry.truck.liftAxle.enabled;
+  }
+  get trailerLiftAxleIsEnabled() {
+    return telemetryStore.telemetry.trailer.liftAxle.enabled;
+  }
+  get fuelLevelIsLow() {
+    return telemetryStore.telemetry.truck.fuel.warning.enabled;
+  }
+  get engineWaterTemperatureIsHot() {
+    return telemetryStore.telemetry.truck.engine.waterTemperature.warning
+      .enabled;
+  }
+  get batteryVoltageIdLow() {
+    return telemetryStore.telemetry.truck.engine.batteryVoltage.warning.enabled;
+  }
+}
diff --git a/src/model/telemetry-trailer.model.js b/src/model/telemetry-trailer.model.js
new file mode 100644
index 00000000..8a6616f9
--- /dev/null
+++ b/src/model/telemetry-trailer.model.js
@@ -0,0 +1,27 @@
+import { store as telemetryStore } from '@/store/telemetry.store';
+import { flag } from '@/utils/_app';
+import { averageDamage } from '@/utils/telemetry/_common.utils';
+
+export default class TelemetryTrailer {
+  get hasATrailer() {
+    return telemetryStore.telemetry.trailer.model.id.length !== 0;
+  }
+  get countryIdOfLicensePlate() {
+    return telemetryStore.telemetry.trailer.licensePlate.country.id;
+  }
+  get licensePlate() {
+    return telemetryStore.telemetry.trailer.licensePlate.value.replace('.', '');
+  }
+  get countryFlagOfLicensePlate() {
+    return flag(
+      this.countryIdOfLicensePlate,
+      telemetryStore.telemetry.game.game.id
+    );
+  }
+  get averageDamage() {
+    return averageDamage(telemetryStore.telemetry.trailer.damage);
+  }
+  get chassisDamage() {
+    return telemetryStore.telemetry.trailer.damage.chassis * 100;
+  }
+}
diff --git a/src/model/telemetry-truck.model.js b/src/model/telemetry-truck.model.js
new file mode 100644
index 00000000..ef0bf171
--- /dev/null
+++ b/src/model/telemetry-truck.model.js
@@ -0,0 +1,212 @@
+import { store as telemetryStore } from '@/store/telemetry.store';
+import { flag } from '@/utils/_app';
+import { averageDamage } from '@/utils/telemetry/_common.utils';
+import {
+  truckShifterTypeLetter,
+  truckGear
+} from '@/utils/telemetry/_grear.utils';
+import {
+  unit_consumption,
+  unit_degrees,
+  unit_length,
+  unit_pressure,
+  unit_speed,
+  unit_volume
+} from '@/utils/telemetry/_unit-converter.utils';
+
+export default class TelemetryTruck {
+  // <editor-folder> Common
+  get speed() {
+    return unit_speed(telemetryStore.telemetry.truck.speed.value, true, false);
+  }
+  get rpm() {
+    return telemetryStore.telemetry.truck.engine.rpm.value;
+  }
+  get maxRpm() {
+    return telemetryStore.telemetry.truck.engine.rpm.max;
+  }
+  get odometer() {
+    return unit_length(
+      telemetryStore.telemetry.truck.odometer,
+      'km',
+      true,
+      false
+    );
+  }
+  get batteryVoltage() {
+    return telemetryStore.telemetry.truck.engine.batteryVoltage.value;
+  }
+  get hasTruck() {
+    return telemetryStore.telemetry.truck.brand.id.length !== 0;
+  }
+  get countryIdOfLicensePlate() {
+    return telemetryStore.telemetry.truck.licensePlate.country.id;
+  }
+  get countryFlagOfLicensePlate() {
+    return flag(
+      this.countryIdOfLicensePlate,
+      telemetryStore.telemetry.game.game.id
+    );
+  }
+  get licensePlate() {
+    return telemetryStore.telemetry.truck.licensePlate.value.replace('.', '');
+  }
+  get averageDamage() {
+    return averageDamage(telemetryStore.telemetry.truck.damage);
+  }
+  get chassisDamage() {
+    return telemetryStore.telemetry.truck.damage.chassis * 100;
+  }
+  // </editor-folder> Common
+
+  // <editor-folder> Fuel
+  get fuelLevel() {
+    return unit_volume(telemetryStore.telemetry.truck.fuel.value, true, false);
+  }
+  get fuelCapacity() {
+    return unit_volume(
+      telemetryStore.telemetry.truck.fuel.capacity,
+      true,
+      false
+    );
+  }
+  get fuelAverageConsumption() {
+    return unit_consumption(
+      telemetryStore.telemetry.truck.fuel.avgConsumption,
+      true,
+      false
+    );
+  }
+  get fuelFactor() {
+    return telemetryStore.telemetry.truck.fuel.warning.factor;
+  }
+  // </editor-folder> Fuel
+
+  // <editor-folder> AdBlue
+  get adBlueLevel() {
+    return unit_volume(
+      telemetryStore.telemetry.truck.adBlue.value,
+      true,
+      false
+    );
+  }
+  get adBlueCapacity() {
+    return unit_volume(
+      telemetryStore.telemetry.truck.adBlue.capacity,
+      true,
+      false
+    );
+  }
+  // </editor-folder> AdBlue
+
+  // <editor-folder> Pressures
+  get oilPressure() {
+    return unit_pressure(
+      telemetryStore.telemetry.truck.engine.oilPressure.value,
+      true,
+      false
+    );
+  }
+  get brakeAirPressure() {
+    return unit_pressure(
+      telemetryStore.telemetry.truck.brakes.airPressure.value,
+      true,
+      false
+    );
+  }
+  // </editor-folder> Pressures
+
+  // <editor-folder> Temperature
+  get engineWaterTemperature() {
+    return unit_degrees(
+      telemetryStore.telemetry.truck.engine.waterTemperature.value,
+      true,
+      false
+    );
+  }
+  get engineOilTemperature() {
+    return unit_degrees(
+      telemetryStore.telemetry.truck.engine.oilTemperature.value,
+      true,
+      false
+    );
+  }
+  get brakeTemperature() {
+    return unit_degrees(
+      telemetryStore.telemetry.truck.brakes.temperature.value,
+      true,
+      false
+    );
+  }
+  // </editor-folder> Temperature
+
+  // <editor-folder> Informations
+  get hasWarnings() {
+    return (
+      (telemetryStore.telemetry.truck.brakes.airPressure.warning.enabled ||
+        telemetryStore.telemetry.truck.fuel.warning.enabled ||
+        telemetryStore.telemetry.truck.adBlue.warning.enabled ||
+        telemetryStore.telemetry.truck.engine.oilPressure.warning.enabled ||
+        telemetryStore.telemetry.truck.engine.waterTemperature.warning
+          .enabled ||
+        telemetryStore.telemetry.truck.engine.batteryVoltage.warning.enabled) &&
+      telemetryStore.telemetry.truck.electric.enabled
+    );
+  }
+  get hasErrors() {
+    return (
+      telemetryStore.telemetry.truck.brakes.airPressure.emergency.enabled &&
+      telemetryStore.telemetry.truck.electric.enabled
+    );
+  }
+  get hasEngineWarning() {
+    return telemetryStore.telemetry.truck.engine.damage >= 0.5;
+  }
+  // </editor-folder> Informations
+
+  // <editor-folder> Transmission
+  get shifterType() {
+    return telemetryStore.telemetry.truck.transmission.shifterType;
+  }
+  get shifterTypeLetter() {
+    return truckShifterTypeLetter(this.shifterType);
+  }
+  get gear() {
+    return telemetryStore.telemetry.truck.transmission.gear.displayed;
+  }
+  get gearDisplayed() {
+    return truckGear(this.gear, this.shifterType, this.brandName);
+  }
+  get gearDisplayedWithoutShifterType() {
+    return truckGear(this.gear, this.shifterType, this.brandName, false);
+  }
+  // </editor-folder> Transmission
+
+  // <editor-folder> Cruise control
+  get cruiseControlIsEnabled() {
+    return telemetryStore.telemetry.truck.cruiseControl.enabled;
+  }
+  get cruiseControlSpeed() {
+    return unit_speed(
+      telemetryStore.telemetry.truck.cruiseControl.value,
+      true,
+      false
+    );
+  }
+  // </editor-folder> Cruise control
+
+  // <editor-folder> Brand
+  get brandName() {
+    return telemetryStore.telemetry.truck.brand.name;
+  }
+  get brandId() {
+    return telemetryStore.telemetry.truck.brand.id;
+  }
+  get modelName() {
+    return telemetryStore.telemetry.truck.model.name;
+  }
+  get modelId() {
+    return telemetryStore.telemetry.truck.model.id;
+  }
+  // </editor-folder> Brand
+}
diff --git a/src/model/telemetry.model.js b/src/model/telemetry.model.js
new file mode 100644
index 00000000..2ba784a5
--- /dev/null
+++ b/src/model/telemetry.model.js
@@ -0,0 +1,42 @@
+import TelemetryJob from '@/model/telemetry-job.model';
+import TelemetryNavigation from '@/model/telemetry-navigation.model';
+import TelemetrySymbols from '@/model/telemetry-symbols.model';
+import TelemetryTrailer from '@/model/telemetry-trailer.model';
+import TelemetryTruck from '@/model/telemetry-truck.model';
+import { store as telemetryStore } from '@/store/telemetry.store';
+
+export default class Telemetry {
+  constructor() {
+    this._truck = new TelemetryTruck();
+    this._navigation = new TelemetryNavigation();
+    this._symbols = new TelemetrySymbols();
+    this._job = new TelemetryJob();
+    this._trailer = new TelemetryTrailer();
+  }
+
+  get gameTime() {
+    return telemetryStore.telemetry.game.time.unix;
+  }
+  get gameId() {
+    return telemetryStore.telemetry.game.game.id;
+  }
+  get gameSdkIsActive() {
+    return telemetryStore.telemetry.game.sdkActive;
+  }
+
+  get truck() {
+    return this._truck;
+  }
+  get navigation() {
+    return this._navigation;
+  }
+  get symbols() {
+    return this._symbols;
+  }
+  get job() {
+    return this._job;
+  }
+  get trailer() {
+    return this._trailer;
+  }
+}
diff --git a/src/store/telemetry.store.js b/src/store/telemetry.store.js
index 7f0811bc..126d21cc 100644
--- a/src/store/telemetry.store.js
+++ b/src/store/telemetry.store.js
@@ -1,8 +1,10 @@
+import Telemetry from '@/model/telemetry.model';
 import testData from 'ets2-dashboard-lib/sdk/scs_sdk_plugin_parsed_data.json';
 import Vue from 'vue';
 
 export const store = Vue.observable({
   telemetry: testData,
+  model: null,
   gameConnected: false,
   receivedData: false
 });
@@ -10,6 +12,7 @@ export const store = Vue.observable({
 export const mutations = {
   setTelemetry(payload) {
     store.telemetry = payload;
+    store.model = new Telemetry();
   },
   setReceivedData(payload) {
     store.receivedData = payload;
diff --git a/src/utils/_splashScreen.js b/src/utils/_splashScreen.js
index 3e1133c8..f5a88e07 100644
--- a/src/utils/_splashScreen.js
+++ b/src/utils/_splashScreen.js
@@ -6,7 +6,7 @@
  * Time: 	21:41
  */
 
-import { $telemetryDataIsEnough } from '@/utils/telemetry/_job.utils';
+import { telemetryDataIsEnough } from '@/utils/telemetry/_common.utils';
 import testData from 'ets2-dashboard-lib/sdk/scs_sdk_plugin_parsed_data.json';
 import store from '@/store';
 import { basePathHost, pushLog } from '@/utils/_app';
@@ -145,7 +145,7 @@ export const waitingTruckSpawn = () => {
         message: 'Last waiting time to drive'
       });
 
-      if ($telemetryDataIsEnough()) {
+      if (telemetryDataIsEnough()) {
         clearInterval(waitingInterval);
         resolve();
       }
diff --git a/src/utils/telemetry/_common.utils.js b/src/utils/telemetry/_common.utils.js
index f1d96642..e6bb2add 100644
--- a/src/utils/telemetry/_common.utils.js
+++ b/src/utils/telemetry/_common.utils.js
@@ -1,10 +1,8 @@
 import store from '@/store';
 import { store as telemetryStore } from '@/store/telemetry.store';
-import { dateTimeLocalized, flag } from '@/utils/_app';
 
 export const config = (name) => store.getters['config/get'](name);
-export const $flag = (countryName, gameID) => flag(countryName, gameID);
-export const $averageDamage = (arrayDamage) => {
+export const averageDamage = (arrayDamage) => {
   const keyLength = Object.keys(arrayDamage).filter(
     (k) => k !== 'total'
   ).length;
@@ -16,7 +14,7 @@ export const $averageDamage = (arrayDamage) => {
 
   return Math.floor(100 * (sum / keyLength));
 };
-export const $scale = (currentSkin) => {
+export const scale = (currentSkin) => {
   const scaleX =
     currentSkin.size.width === 0
       ? 1
@@ -30,32 +28,11 @@ export const $scale = (currentSkin) => {
   return Math.min(scaleX, scaleY);
 };
 
-export const $hasWarnings = () => {
+export const telemetryDataIsEnough = () => {
   return (
-    (telemetryStore.telemetry.truck.brakes.airPressure.warning.enabled ||
-      telemetryStore.telemetry.truck.fuel.warning.enabled ||
-      telemetryStore.telemetry.truck.adBlue.warning.enabled ||
-      telemetryStore.telemetry.truck.engine.oilPressure.warning.enabled ||
-      telemetryStore.telemetry.truck.engine.waterTemperature.warning.enabled ||
-      telemetryStore.telemetry.truck.engine.batteryVoltage.warning.enabled) &&
-    telemetryStore.telemetry.truck.electric.enabled
+    telemetryStore.receivedData &&
+    telemetryStore.model.gameSdkIsActive &&
+    telemetryStore.model.truck.hasTruck &&
+    store.getters['config/gameConfigLoaded']
   );
 };
-
-export const $hasErrors = () => {
-  return (
-    telemetryStore.telemetry.truck.brakes.airPressure.emergency.enabled &&
-    telemetryStore.telemetry.truck.electric.enabled
-  );
-};
-
-export const $hasEngineWarning = () => {
-  return telemetryStore.telemetry.truck.engine.damage >= 0.5; // >= 50%
-};
-
-export const $dateTimeLocalized = (time, dFormat, tFormat) => {
-  return dateTimeLocalized(time, dFormat, tFormat);
-};
-export const $toFixed = (value, decimal) => {
-  return value.toFixed(decimal);
-};
diff --git a/src/utils/telemetry/_grear.utils.js b/src/utils/telemetry/_grear.utils.js
index 932eef12..8f2bc84a 100644
--- a/src/utils/telemetry/_grear.utils.js
+++ b/src/utils/telemetry/_grear.utils.js
@@ -1,10 +1,9 @@
 import { config } from '@/utils/telemetry/_common.utils';
 
-export const $gearInfo = (transmission, brand) => {
-  let gear = transmission.gear.displayed;
+export const crawlingGearCount = (brandName) => {
   let crawlingGear = 0;
 
-  switch (brand.name) {
+  switch (brandName) {
     case 'Volvo':
     case 'Scania':
     case 'Kenworth':
@@ -12,28 +11,31 @@ export const $gearInfo = (transmission, brand) => {
       break;
   }
 
-  return { gear, crawlingGear };
+  return crawlingGear;
 };
 
-export const $trukGear = (transmission, brand, withShifterType = true) => {
-  const gear = $gearInfo(transmission, brand).gear;
-  const crawlingGear = $gearInfo(transmission, brand).crawlingGear;
+export const truckGear = (
+  gear,
+  shifterType,
+  brandName,
+  withShifterType = true
+) => {
+  const crawlingGear = crawlingGearCount(brandName);
   const hShiftLayout = config('general_h-shift-layout');
   const rangeAndSplitterEnabled = hShiftLayout === 'h-shifter';
   let strGear = gear;
 
-  if (transmission.shifterType === 'hshifter' && rangeAndSplitterEnabled) {
+  if (shifterType === 'hshifter' && rangeAndSplitterEnabled) {
     let realGearCount = gear - crawlingGear;
-    let spliter = realGearCount % 2 ? 'L' : 'H';
+    let splitter = realGearCount % 2 ? 'L' : 'H';
     let realGear = Math.ceil(realGearCount / 2);
-    strGear = realGear + spliter;
+    strGear = realGear + splitter;
   } else {
     strGear = gear - crawlingGear;
   }
 
   if (
-    (transmission.shifterType === 'automatic' ||
-      transmission.shifterType === 'arcade') &&
+    (shifterType === 'automatic' || shifterType === 'arcade') &&
     withShifterType
   )
     strGear = 'A' + (gear - crawlingGear);
@@ -42,16 +44,12 @@ export const $trukGear = (transmission, brand, withShifterType = true) => {
 
   if (gear === 0) strGear = 'N';
 
-  if (gear < 0) strGear = 'R' + Math.abs(transmission.gear.displayed);
+  if (gear < 0) strGear = 'R' + Math.abs(gear);
 
   return strGear;
 };
 
-export const $truckShifterTypeLetter = (transmission) => {
-  if (
-    transmission.shifterType === 'automatic' ||
-    transmission.shifterType === 'arcade'
-  )
-    return 'A';
+export const truckShifterTypeLetter = (shifterType) => {
+  if (shifterType === 'automatic' || shifterType === 'arcade') return 'A';
   else return 'M';
 };
diff --git a/src/utils/telemetry/_helper.utils.js b/src/utils/telemetry/_helper.utils.js
deleted file mode 100644
index 2126cb2e..00000000
--- a/src/utils/telemetry/_helper.utils.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { store as telemetryStore } from '@/store/telemetry.store';
-
-export const $gameTime = () => telemetryStore.telemetry.game.time.unix;
-
-//export const $truckElectricOn = () => {
-//  return telemetryStore.telemetry.truck.electric.enabled;
-//};
diff --git a/src/utils/telemetry/_job.utils.js b/src/utils/telemetry/_job.utils.js
deleted file mode 100644
index 9af58f42..00000000
--- a/src/utils/telemetry/_job.utils.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import store from '@/store';
-import { store as telemetryStore } from '@/store/telemetry.store';
-import { diffDateTimeLocalized, displayDuration } from '@/utils/_app';
-import { config } from '@/utils/telemetry/_common.utils';
-
-export const $hasJob = () => {
-  return telemetryStore.telemetry.job.cargo.id.length !== 0;
-};
-export const $jobRemainingTimeDelivery = (time) => {
-  const gameTime = telemetryStore.telemetry.game.time.value;
-  let diff = time - gameTime;
-
-  return displayDuration(diff);
-};
-
-export const $jobRemainingTimeToDueDate = () => {
-  return config('general_job_remaining') === 'due_date';
-};
-
-export const $nextRestStop = (time, customFormat) => {
-  return diffDateTimeLocalized(0, time, false, customFormat);
-};
-
-export const $jobDeliveryTime = () => {
-  return telemetryStore.telemetry.job.market.id === 'external_contracts'
-    ? telemetryStore.telemetry.job.expectedDeliveryTimestamp.value
-    : telemetryStore.telemetry.job.expectedDeliveryTimestamp.unix;
-};
-
-export const $telemetryDataIsEnough = () => {
-  return (
-    telemetryStore.receivedData &&
-    telemetryStore.telemetry.game.sdkActive &&
-    telemetryStore.telemetry.truck.brand.id.length !== 0 &&
-    store.getters['config/gameConfigLoaded']
-  );
-};
diff --git a/src/utils/telemetry/_navigation.utils.js b/src/utils/telemetry/_navigation.utils.js
deleted file mode 100644
index c1368d22..00000000
--- a/src/utils/telemetry/_navigation.utils.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import { store as telemetryStore } from '@/store/telemetry.store';
-import { diffDateTimeLocalized } from '@/utils/_app';
-import { $gameTime } from '@/utils/telemetry/_helper.utils';
-
-export const $etaDueDate = () => {
-  const currentGameTime = $gameTime();
-  return telemetryStore.telemetry.navigation.time + currentGameTime;
-};
-
-export const $etaRemaing = () => {
-  const currentGameTime = $gameTime();
-  const etaTime = $etaDueDate();
-
-  return diffDateTimeLocalized(currentGameTime, etaTime);
-};
-
-export const $haveAnActiveNavigation = () => {
-  return telemetryStore.telemetry.navigation.distance > 0;
-};
-
-export const $haveAnActiveSpeedLimit = () => {
-  return telemetryStore.telemetry.navigation.speedLimit.value > 0;
-};
diff --git a/src/utils/telemetry/_trailer.utils.js b/src/utils/telemetry/_trailer.utils.js
deleted file mode 100644
index 03715ed8..00000000
--- a/src/utils/telemetry/_trailer.utils.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { store as telemetryStore } from '@/store/telemetry.store';
-import { $averageDamage, config } from '@/utils/telemetry/_common.utils';
-
-export const $hasTrailer = () => {
-  return telemetryStore.telemetry.trailer.model.id.length !== 0;
-};
-export const $hasTrailerAndJob = () => {
-  return (
-    telemetryStore.telemetry.trailer.model.id.length !== 0 &&
-    telemetryStore.telemetry.job.cargo.name.length !== 0
-  );
-};
-export const $trailerDamage = () => {
-  return config('general_damage_accurate') === 'damage-diagnostic'
-    ? $averageDamage(telemetryStore.telemetry.trailer.damage)
-    : Math.floor(100 * telemetryStore.telemetry.trailer.damage.chassis);
-};
diff --git a/src/utils/telemetry/_truck.utils.js b/src/utils/telemetry/_truck.utils.js
deleted file mode 100644
index afd90f98..00000000
--- a/src/utils/telemetry/_truck.utils.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { store as telemetryStore } from '@/store/telemetry.store';
-import { $averageDamage, config } from '@/utils/telemetry/_common.utils';
-
-export const $hasTruck = () => {
-  return telemetryStore.telemetry.truck.brand.id.length !== 0;
-};
-
-export const $truckDamage = () => {
-  return config('general_damage_accurate') === 'damage-diagnostic'
-    ? $averageDamage(telemetryStore.telemetry.truck.damage)
-    : Math.floor(100 * telemetryStore.telemetry.truck.damage.chassis);
-};
diff --git a/src/utils/telemetry/_unit-converter.utils.js b/src/utils/telemetry/_unit-converter.utils.js
index 19876469..19fce2d9 100644
--- a/src/utils/telemetry/_unit-converter.utils.js
+++ b/src/utils/telemetry/_unit-converter.utils.js
@@ -4,14 +4,15 @@ import {
   mass as uc_mass,
   pressure as uc_pressure,
   temperature as uc_temperature,
-  volume as uc_volume
+  volume as uc_volume,
+  speed as uc_speed
 } from 'units-converter';
 
 export const unit_speed = (value, showValue = true, showSymbol = true) => {
   const speed = config('unit_speed');
   let unit = '';
 
-  value = value[speed];
+  //value = value[speed];
 
   switch (speed) {
     case 'kph':
@@ -21,6 +22,8 @@ export const unit_speed = (value, showValue = true, showSymbol = true) => {
       unit = 'm/h';
       break;
   }
+  const conversion = uc_speed(value).from('m/s').to(unit);
+  value = conversion.value;
 
   if (showValue && !showSymbol) return value;
 
@@ -226,6 +229,22 @@ export const $pressureToBar = (inPressure, unit = 'bar') => {
 
   return pressure;
 };
-export const $pressureUnitReadable = (pressure) =>
-  unit_pressure(pressure, true, false);
-export const $speedUnitReadable = (speed) => unit_speed(speed, true, false);
+
+export const $unitReadable = (unit, from = null, value = 1) => {
+  switch (unit) {
+    case 'unit_speed':
+      return unit_speed(value, false, true);
+    case 'unit_degrees':
+      return unit_degrees(value, false, true);
+    case 'unit_length':
+      return unit_length(value, from, false, true);
+    case 'unit_consumption':
+      return unit_consumption(value, false, true);
+    case 'unit_pressure':
+      return unit_pressure(value, false, true);
+    case 'unit_currency':
+      return unit_currency(value, false, true);
+    case 'unit_volume':
+      return unit_volume(value, false, true);
+  }
+};
diff --git a/test/unit/src/utils/telemetry/common.spec.js b/test/unit/src/utils/telemetry/common.spec.js
index e111f35b..2a08b833 100644
--- a/test/unit/src/utils/telemetry/common.spec.js
+++ b/test/unit/src/utils/telemetry/common.spec.js
@@ -1,9 +1,9 @@
 import { store as telemetryStore } from '@/store/telemetry.store';
 import {
-  $averageDamage,
+  averageDamage,
   $hasErrors,
   $hasWarnings,
-  $scale
+  scale
 } from '@/utils/telemetry/_common.utils';
 import { jest } from '@jest/globals';
 import { applyChangesOnTelemetryFromDataProvider } from '../../../test.helper';
@@ -27,7 +27,7 @@ describe('Telemetry common utils', () => {
       { size: { width: windowWidth, height: windowHeight } },
       { size: { width: 0, height: 0 } }
     ])('The skin should be reduced', (currentSkin) => {
-      expect($scale(currentSkin)).toBeLessThan(1);
+      expect(scale(currentSkin)).toBeLessThan(1);
     });
 
     test.each([
@@ -39,7 +39,7 @@ describe('Telemetry common utils', () => {
       { size: { width: windowWidth, height: windowHeight } },
       { size: { width: 0, height: 0 } }
     ])('The skin should be enlarged', (currentSkin) => {
-      expect($scale(currentSkin)).toBeGreaterThanOrEqual(1);
+      expect(scale(currentSkin)).toBeGreaterThanOrEqual(1);
     });
   });
 
@@ -54,7 +54,7 @@ describe('Telemetry common utils', () => {
         total: 0
       }
     ])('The average damage should be correct', (arrayDamage) => {
-      expect($averageDamage(arrayDamage)).toBe(30);
+      expect(averageDamage(arrayDamage)).toBe(30);
     });
   });