diff --git a/MapView/datasource.py b/MapView/datasource.py
index 752e0b0..74ede8e 100644
--- a/MapView/datasource.py
+++ b/MapView/datasource.py
@@ -72,8 +72,8 @@ class Datasource:
         )
         new_points = [
             (
-                processed_agent_data.latitude,
                 processed_agent_data.longitude,
+                processed_agent_data.latitude,
                 processed_agent_data.road_state,
                 processed_agent_data.user_id
             )
diff --git a/MapView/main.py b/MapView/main.py
index 1b108c6..f986a05 100644
--- a/MapView/main.py
+++ b/MapView/main.py
@@ -87,7 +87,8 @@ class MapViewApp(App):
             self.car_markers[user_id].lat = lat
             self.car_markers[user_id].lon = lon
 
-        self.mapview.center_on(lat, lon)
+        if user_id == 1:
+            self.mapview.center_on(lat, lon)
 
     def set_pothole_marker(self, point):
         if isinstance(point, dict):