Add further debugging