Add debugging back