Updated catcher.c to work