Adding debug back in