diff --git a/app/Http/Controllers/Api/AcarsController.php b/app/Http/Controllers/Api/AcarsController.php
index bcaf3710..5a30c24e 100644
--- a/app/Http/Controllers/Api/AcarsController.php
+++ b/app/Http/Controllers/Api/AcarsController.php
@@ -107,7 +107,7 @@ class AcarsController extends Controller
         return new AcarsRouteResource(Acars::where([
             'pirep_id' => $id,
             'type'     => AcarsType::FLIGHT_PATH
-        ])->orderBy('created_at', 'asc')->get());
+        ])->orderBy('sim_time', 'asc')->get());
     }
 
     /**
diff --git a/app/Models/Pirep.php b/app/Models/Pirep.php
index eac0b0d7..0b5d469f 100644
--- a/app/Models/Pirep.php
+++ b/app/Models/Pirep.php
@@ -402,14 +402,16 @@ class Pirep extends Model
     {
         return $this->hasMany(Acars::class, 'pirep_id')
             ->where('type', AcarsType::FLIGHT_PATH)
-            ->orderBy('created_at', 'desc');
+            ->orderBy('created_at', 'asc')
+            ->orderBy('sim_time', 'asc');
     }
 
     public function acars_logs()
     {
         return $this->hasMany(Acars::class, 'pirep_id')
             ->where('type', AcarsType::LOG)
-            ->orderBy('created_at', 'desc');
+            ->orderBy('created_at', 'desc')
+            ->orderBy('sim_time', 'asc');
     }
 
     public function acars_route()
diff --git a/app/Services/GeoService.php b/app/Services/GeoService.php
index d036c49c..2ca39cca 100644
--- a/app/Services/GeoService.php
+++ b/app/Services/GeoService.php
@@ -197,15 +197,24 @@ class GeoService extends Service
 
         $route = new GeoJson();
 
+        $actual_route = $this->acarsRepo->forPirep($pirep->id, AcarsType::FLIGHT_PATH);
+        foreach ($actual_route as $point) {
+            $route->addPoint($point->lat, $point->lon, [
+                'pirep_id' => $pirep->id,
+                'alt'      => $point->altitude,
+                //'popup'    => 'GS: '.$point->gs.'<br />Alt: '.$point->altitude,
+            ]);
+        }
+
         /**
          * @var $point \App\Models\Acars
          */
-        foreach ($pirep->acars as $point) {
+        /*foreach ($pirep->acars as $point) {
             $route->addPoint($point->lat, $point->lon, [
                 'pirep_id' => $pirep->id,
                 'alt'      => $point->altitude,
             ]);
-        }
+        }*/
 
         return [
             'position' => [