Updated for debug.c