Modifications to work with gazebo