diff --git a/README.md b/README.md
index 731aba2..2615deb 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ ros2 launch aws_robomaker_racetrack_world view_racetrack.launch.py
 ```
 
 # Robot Simulation
-A good initial robot position near the start line is (2.75, -14.00, 0.0).   
+A good initial robot position near the start line is (2.75, -15.00, 0.2).   
 
 ![Gazebo01](docs/images/turtlebot_burger.png)
 
diff --git a/launch/racetrack.launch b/launch/racetrack.launch
deleted file mode 100644
index 121407b..0000000
--- a/launch/racetrack.launch
+++ /dev/null
@@ -1,17 +0,0 @@
-<launch>
-  <!-- Always set GUI to false for AWS RoboMaker Simulation
-       Use gui:=true on roslaunch command-line to run with a gui.
-  -->
-  <arg name="gui" default="false"/>
-  <arg name="mode" default="day" doc="mode of the track to load, valid options are 'day' or 'night'"/>
-
-  <include file="$(find gazebo_ros)/launch/empty_world.launch">
-    <arg name="world_name" value="$(find aws_robomaker_racetrack_world)/worlds/racetrack_$(arg mode).world"/>
-    <arg name="paused" default="false"/>
-    <arg name="use_sim_time" default="true"/>
-    <arg name="gui" default="$(arg gui)"/>
-    <arg name="headless" default="false"/>
-    <arg name="debug" default="false"/>
-    <arg name="verbose" default="true"/>
-  </include>
-</launch>
diff --git a/launch/racetrack.launch.py b/launch/racetrack.launch.py
index 2ad16c0..d74e300 100644
--- a/launch/racetrack.launch.py
+++ b/launch/racetrack.launch.py
@@ -2,17 +2,16 @@
 import sys
 
 import launch
-from launch.conditions import IfCondition
-from launch.substitutions import PythonExpression
+from launch import LaunchDescription
+from launch.actions import DeclareLaunchArgument
 from ament_index_python.packages import get_package_share_directory
 
 
 def generate_launch_description():
-
-    mode = launch.substitutions.LaunchConfiguration('mode')
-    world = os.path.join(get_package_share_directory('aws_robomaker_racetrack_world'), 'worlds')
-
+    mode = 'day' # Change mode
+    package_dir = get_package_share_directory('aws_robomaker_racetrack_world')
     gazebo_ros = get_package_share_directory('gazebo_ros')
+
     gazebo_client = launch.actions.IncludeLaunchDescription(
 	launch.launch_description_sources.PythonLaunchDescriptionSource(
             os.path.join(gazebo_ros, 'launch', 'gzclient.launch.py')),
@@ -22,27 +21,27 @@ def generate_launch_description():
         launch.launch_description_sources.PythonLaunchDescriptionSource(
             os.path.join(gazebo_ros, 'launch', 'gzserver.launch.py'))
     )
-    mode = launch.substitutions.LaunchConfiguration('mode')
     
-    ld = launch.LaunchDescription([
-        launch.actions.DeclareLaunchArgument(
+    return LaunchDescription([
+        DeclareLaunchArgument(
           'world',
-          default_value=[PythonExpression(['"',world,'" + "/racetrack_" + "', mode, '" + ".world"']),''],
+          default_value=[os.path.join(package_dir, 'worlds', 'racetrack_' + mode + '.world'), ''],
           description='SDF world file'),
-        launch.actions.DeclareLaunchArgument(
+        DeclareLaunchArgument(
             name='gui',
             default_value='false'
         ),
-        launch.actions.DeclareLaunchArgument(
-          name='mode',
-          default_value='night',
-          description='day or night modes are available'),
+        DeclareLaunchArgument(
+            name='use_sim_time',
+            default_value='true'
+        ),
+        DeclareLaunchArgument('state',
+            default_value='true',
+            description='Set "true" to load "libgazebo_ros_state.so"'),
         gazebo_server,
-        gazebo_client
+        gazebo_client,
     ])
 
-    return ld
-
 
 if __name__ == '__main__':
     generate_launch_description()
diff --git a/launch/view_racetrack.launch b/launch/view_racetrack.launch
deleted file mode 100644
index beaf70c..0000000
--- a/launch/view_racetrack.launch
+++ /dev/null
@@ -1,7 +0,0 @@
-<launch>
-  <!-- Show Gazebo GUI on launch -->
-  <include file="$(find aws_robomaker_racetrack_world)/launch/racetrack.launch">
-    <arg name="gui" value="true"/>
-    <arg name="world_version" value="day"/>
-  </include>
-</launch>
diff --git a/launch/view_racetrack.launch.py b/launch/view_racetrack.launch.py
new file mode 100644
index 0000000..5ef2f14
--- /dev/null
+++ b/launch/view_racetrack.launch.py
@@ -0,0 +1,25 @@
+import os
+import sys
+
+import launch
+import launch_ros.actions
+from ament_index_python.packages import get_package_share_directory
+
+
+def generate_launch_description():
+    ld = launch.LaunchDescription([
+        launch.actions.IncludeLaunchDescription(
+            launch.launch_description_sources.PythonLaunchDescriptionSource(
+                [get_package_share_directory(
+                    'aws_robomaker_racetrack_world'), '/launch/racetrack.launch.py']
+            ),
+            launch_arguments={
+                'gui': 'true'
+            }.items()
+        )
+    ])
+    return ld
+
+
+if __name__ == '__main__':
+    generate_launch_description()