Updating catcher.c and tube.c