diff --git a/app/controllers/DashboardController.php b/app/controllers/DashboardController.php
index c3cde6a..6025fbf 100644
--- a/app/controllers/DashboardController.php
+++ b/app/controllers/DashboardController.php
@@ -12,7 +12,7 @@ class DashboardController extends Controller {
             "mileage" => [],
             "liters" => []
         ];
-        $raw_data = $default_car ? $refuel->latest_data($default_car['id'], 5) : [];
+        $raw_data = $default_car ? $refuel->latest_data($default_car['id'], 0) : [];
         foreach($raw_data as $one) {
             array_push($data['date'], date('d. m.', strtotime($one['created_at'])));
             array_push($data['price'], $one['price_per_liter']);
diff --git a/app/models/Refuel.php b/app/models/Refuel.php
index b01ffc8..3aa73b2 100644
--- a/app/models/Refuel.php
+++ b/app/models/Refuel.php
@@ -38,15 +38,24 @@ class Refuel {
 
     public function latest_data($vehicle_id, $record_count) {
         try {
-            $stmt = $this->db->prepare("
+            $sql = "
                 SELECT `liters`, `price_per_liter`, `total_price`, `mileage`, `created_at`
                 FROM `refueling_records`
                 WHERE `vehicle_id` = ?
-                ORDER BY created_at DESC
-                LIMIT ?;
-            ");
+                ORDER BY created_at DESC";
+
+            if ($record_count > 0) {
+                $sql .= " LIMIT ?";
+            }
+
+            $stmt = $this->db->prepare($sql);
+
+            if ($record_count > 0) {
+                $stmt->bind_param("ii", $vehicle_id, $record_count);
+            } else {
+                $stmt->bind_param("i", $vehicle_id);
+            }
 
-            $stmt->bind_param("ii", $vehicle_id, $record_count);
             if ($stmt->execute()) {
                 $result = $stmt->get_result();
                 $data = $result->fetch_all(MYSQLI_ASSOC);
@@ -62,7 +71,7 @@ class Refuel {
 
     public function latest_one($vehicle_id, $record_count = 1) {
         try {
-            $stmt = $this->db->prepare("
+            $sql = "
                 SELECT 
                     `r`.`vehicle_id`, 
                     `v`.`name` AS `vehicle_name`, 
@@ -75,11 +84,20 @@ class Refuel {
                 FROM `refueling_records` AS `r`
                 JOIN `vehicles` AS `v` ON `r`.`vehicle_id` = `v`.`id`
                 WHERE `r`.`vehicle_id` = ?
-                ORDER BY `r`.`created_at` DESC
-                LIMIT ?;
-            ");
+                ORDER BY `r`.`created_at` DESC";
+
+            if ($record_count > 0) {
+                $sql .= " LIMIT ?";
+            }
+
+            $stmt = $this->db->prepare($sql);
+
+            if ($record_count > 0) {
+                $stmt->bind_param("ii", $vehicle_id, $record_count);
+            } else {
+                $stmt->bind_param("i", $vehicle_id);
+            }
 
-            $stmt->bind_param("ii", $vehicle_id, $record_count);
             if ($stmt->execute()) {
                 $result = $stmt->get_result();
                 $data = $result->fetch_all(MYSQLI_ASSOC);
diff --git a/app/views/dashboard/index.php b/app/views/dashboard/index.php
index 2998736..0768898 100644
--- a/app/views/dashboard/index.php
+++ b/app/views/dashboard/index.php
@@ -97,25 +97,23 @@
 </script>
 
 <script>
-    const data2 = <?= json_encode($data['date_price_data']); ?>;
-    let cnt_ltr = 0
-    let cnt_km = 0
-    let first_km = 0
+	const data2 = <?= json_encode($data['date_price_data']); ?>;
+	let cnt_ltr = 0;
+    let last_ltr = 0;
+    let last_km = 0;
 
-    console.log(data2)
+	console.log(data2);
 
-    for(let i = 0; i < data2['liters'].length; i++) {
-        if(i == 0) {
-            first_km = data2['mileage'][i]
-        }
-        cnt_ltr += data2['liters'][i]
-        cnt_km =+ data2['mileage'][i]
-    }
+	for (let i = 0; i < data2['liters'].length; i++) {
+		cnt_ltr += data2['liters'][i]
+        last_ltr = data2['liters'][i]
+        last_km = data2['mileage'][i]
+	}
 
-    console.log("Liters", cnt_ltr, cnt_km, first_km)
-    console.log("Avg", (cnt_km - first_km) / cnt_ltr)
+    cnt_ltr -= last_ltr
 
-    document.querySelector("#avg-fl-cnsmp").textContent = Math.floor((cnt_km - first_km) / cnt_ltr) + " l/100km"
+	document.querySelector("#avg-fl-cnsmp").textContent =
+		(cnt_ltr/last_km*100).toFixed(1) + " l/100km";
 </script>