finalized catkin portation