Changes made to move it to catkin.