diff --git a/openarm_bringup/launch/openarm.launch.py b/openarm_bringup/launch/openarm.launch.py
index 84994ac..84246f0 100644
--- a/openarm_bringup/launch/openarm.launch.py
+++ b/openarm_bringup/launch/openarm.launch.py
@@ -131,7 +131,7 @@ def generate_launch_description():
         [FindPackageShare(runtime_config_package), "config", controllers_file]
     )
     rviz_config_file = PathJoinSubstitution(
-        [FindPackageShare(description_package), "rviz", "openarm.rviz"]
+        [FindPackageShare(description_package), "rviz", "robot_description.rviz"]
     )
 
     control_node = Node(
diff --git a/openarm_description/urdf/openarm.ros2_control.xacro b/openarm_description/urdf/openarm.ros2_control.xacro
index a06b9ed..0d01383 100644
--- a/openarm_description/urdf/openarm.ros2_control.xacro
+++ b/openarm_description/urdf/openarm.ros2_control.xacro
@@ -15,16 +15,20 @@
 　limitations under the License.
 -->
 <robot xmlns:xacro="http://www.ros.org/wiki/xacro">
-    <xacro:macro name="openarm_ros2_control" params="name initial_positions_file prefix:='' can_device='can0'">
+    <xacro:macro name="openarm_ros2_control" params="name initial_positions_file prefix:='' can_device='can0' use_mock_hardware:=false mock_sensor_commands:=false">
         <xacro:property name="initial_positions" value="${xacro.load_yaml(initial_positions_file)['initial_positions']}"/>
 
         <ros2_control name="${prefix}${name}" type="system">
             <hardware>
-                <!-- By default, set up controllers for simulation. This won't work on real hardware -->
-                <!-- <plugin>mock_components/GenericSystem</plugin> -->
-                <plugin>openarm_hardware/OpenArmHW</plugin>
-                <param name="prefix">${prefix}</param>
-                <param name="can_device">${can_device}</param>
+                <xacro:if value="${use_mock_hardware}">
+                    <plugin>mock_components/GenericSystem</plugin>
+                    <param name="mock_sensor_commands">${mock_sensor_commands}</param>
+                </xacro:if>
+                <xacro:unless value="${use_mock_hardware}">
+                    <plugin>openarm_hardware/OpenArmHW</plugin>
+                    <param name="prefix">${prefix}</param>
+                    <param name="can_device">${can_device}</param>
+                </xacro:unless>
             </hardware>
             <joint name="${prefix}rev1">
                 <command_interface name="position"/>
diff --git a/openarm_description/urdf/openarm.urdf.xacro b/openarm_description/urdf/openarm.urdf.xacro
index c39005e..e092c00 100644
--- a/openarm_description/urdf/openarm.urdf.xacro
+++ b/openarm_description/urdf/openarm.urdf.xacro
@@ -15,7 +15,11 @@
 　limitations under the License.
 -->
 <robot xmlns:xacro="http://www.ros.org/wiki/xacro" name="openarm">
+    <xacro:arg name="prefix" default="" />
+    <xacro:arg name="use_mock_hardware" default="false" />
+    <xacro:arg name="mock_sensor_commands" default="false" />
+    
     <xacro:include filename="openarm.xacro"/>
-    <xacro:openarm/>
+    <xacro:openarm prefix="$(arg prefix)" use_mock_hardware="$(arg use_mock_hardware)" mock_sensor_commands="$(arg mock_sensor_commands)"/>
     <xacro:include filename="$(find openarm_description)/urdf/openarm_sensors.xacro"/>
 </robot>
diff --git a/openarm_description/urdf/openarm.xacro b/openarm_description/urdf/openarm.xacro
index 9a8d6dc..cca28e9 100644
--- a/openarm_description/urdf/openarm.xacro
+++ b/openarm_description/urdf/openarm.xacro
@@ -23,7 +23,7 @@
         <color rgba="${50/255} ${50/255} ${50/255} 1.0"/>
     </material>
 
-    <xacro:macro name="openarm" params="side:='right' prefix:='' zero_pos='up' can_device='can0'">
+    <xacro:macro name="openarm" params="side:='right' prefix:='' zero_pos='up' can_device='can0' use_mock_hardware:=false mock_sensor_commands:=false">
         <!-- side right, left -->
         <!-- recommended prefixes left_, right_, etc. -->
         <!-- zero_pos up, arm -->
@@ -34,7 +34,7 @@
 
         <xacro:include filename="$(find openarm_description)/urdf/openarm.ros2_control.xacro" />
         <xacro:arg name="initial_positions_file" default="$(find openarm_description)/config/initial_positions.yaml" />
-        <xacro:openarm_ros2_control name="OpenArmHW" prefix="${prefix}" initial_positions_file="$(arg initial_positions_file)" can_device="${can_device}"/>
+        <xacro:openarm_ros2_control name="OpenArmHW" prefix="${prefix}" initial_positions_file="$(arg initial_positions_file)" can_device="${can_device}" use_mock_hardware="${use_mock_hardware}" mock_sensor_commands="${mock_sensor_commands}"/>
 
         <link name="${prefix}dummy_link"/>