diff --git a/src/Trip.js b/src/Trip.js
index 871e531..cfe94d3 100644
--- a/src/Trip.js
+++ b/src/Trip.js
@@ -1,9 +1,5 @@
-/*
- * src/Trip.js
- *
- * Processed log for a trip. Currently only includes very basic information
- * about the trip
- */
+// src/Trip.js
+
 import _ from "lodash";
 import Utils from "./Utils";
 
@@ -18,6 +14,7 @@ class Trip {
     this.firstUpdate = firstUpdate;
     this.lastUpdate = "Unknown";
     this.plannedPath = [];
+    this.logs = [];
   }
 
   getTraveledDistance() {
@@ -72,27 +69,35 @@ class Trip {
     return this.plannedPath;
   }
 
-  getPoint(type, path) {
-    return _.get(
-      _.find(this.logs, (log) => log["@type"] === type && _.get(log, path)),
-      path
-    );
+  getPointFromLogs(path, useLatest) {
+    if (!this.logs || this.logs.length === 0) {
+      return null;
+    }
+
+    const sortedLogs = useLatest ? _.sortBy(this.logs, "timestampMS").reverse() : this.logs;
+    for (const log of sortedLogs) {
+      const point = _.get(log, `response.${path}`);
+      if (point) {
+        return point;
+      }
+    }
+    return null;
   }
 
   getPickupPoint() {
-    return this.getPoint("createTrip", "request.trip.pickuppoint.point");
+    return this.getPointFromLogs("pickuppoint.point", true);
   }
 
   getDropoffPoint() {
-    return this.getPoint("createTrip", "request.trip.dropoffpoint.point");
+    return this.getPointFromLogs("dropoffpoint.point", true);
   }
 
   getActualPickupPoint() {
-    return this.getPoint("updateTrip", "response.actualpickuppoint.point");
+    return this.getPointFromLogs("actualpickuppoint.point", false);
   }
 
   getActualDropoffPoint() {
-    return this.getPoint("updateTrip", "response.actualdropoffpoint.point");
+    return this.getPointFromLogs("actualdropoffpoint.point", false);
   }
 }