Adding debugging back