diff --git a/components/i_feed/vehicle.py b/components/i_feed/vehicle.py
index 95de6f4..1b70afc 100644
--- a/components/i_feed/vehicle.py
+++ b/components/i_feed/vehicle.py
@@ -96,10 +96,14 @@ class Vehicle:
         :return: "Datenaufzeichnung für automatisiertes Fahren" (DAF) object
         """
         return DAF(vehicle_identification_number=self.vin,
-                   gps_location=self.gps_location,
+                   # first deduct nce - is calculated, sets velocity to 0 if NCE
                    near_crash_event=self.nce,
-                   velocity=self.velocity,
+                   # then get current location based on last location and current speed
+                   gps_location=self.gps_location,
+                   # finally get last_update, is updated by gps_location deduction
                    timestamp=self.last_update,
+                   # is set to 0 if nce
+                   velocity=self.velocity,
                    )
 
     @property