diff --git a/srunner/autoagents/autoware_nodes/autoware_types/waypoint.py b/srunner/autoagents/autoware_nodes/autoware_types/waypoint.py
index 44dc755..172b916 100644
--- a/srunner/autoagents/autoware_nodes/autoware_types/waypoint.py
+++ b/srunner/autoagents/autoware_nodes/autoware_types/waypoint.py
@@ -1,6 +1,7 @@
 import carla
 from math import atan2
 from srunner.scenariomanager.carla_data_provider import CarlaDataProvider
+from visualization_msgs.msg import Marker
 from tf_transformations import quaternion_from_euler
 from geometry_msgs.msg import Pose
 from geometry_msgs.msg import Point
@@ -12,9 +13,13 @@ def __init__(self, x, y, z):
         self.x = x
         self.y = y
         self.z = z
-        
+
         self.client = CarlaDataProvider.get_client()
 
+        self.marker_publisher = self.create_publisher(
+            Marker, "visulaization_marker", 10
+        )
+
     def autoware_from_world_coords(self) -> Pose:
         """convert from carla world coordinates to autoware waypoints
 
@@ -37,29 +42,55 @@ def autoware_from_world_coords(self) -> Pose:
             z=orientation["z"],
             w=orientation["w"],
         )
+    
+        self._publish_marker()
 
         return pose
 
     def _get_orientation(self) -> dict:
         curr_location = carla.Location(self.x, self.y, self.z)
-        point1 = self.client.get_waypoint(
-            curr_location, project_to_road=True, lane_type=carla.LaneType.Driving
+        point1 = (
+            self.client.get_world()
+            .get_map()
+            .get_waypoint(
+                curr_location, project_to_road=True, lane_type=carla.LaneType.Driving
+            )
         )
-        
+
         # get next waypoint that is 0.5 meters away
-        point2 = point1.next(0.5)
-        
+        point2 = point1.next(0.5)[0]
+
         dx = point2.transform.location.x - point1.transform.location.x
         dy = point2.transform.location.y - point1.transform.location.y
         yaw = atan2(dy, dx)
-        
+
         # rounding is need by autoware to function properly
         qx, qy, qz, qw = quaternion_from_euler(0, 0, round(yaw, 1))
-        
+
         return {
             "x": qx,
             "y": qy,
             "z": qz,
             "w": qw,
         }
-        
+
+    def _publish_marker(self, pose):
+        marker = Marker()
+        marker.header.frame_id = "/map"
+        marker.header.stamp = self.get_clock().now().to_msg()
+
+        marker.type = marker.ARROW
+        marker.action = marker.ADD
+
+        marker.pose = pose
+
+        marker.scale.x = 0.5
+        marker.scale.y = 0.05
+        marker.scale.z = 1
+
+        marker.color.r = 1.0
+        marker.color.g = 0.0
+        marker.color.b = 0.0
+        marker.color.a = 1.0
+
+        self.marker_publisher.publish(marker)