updated for newer catkin