Added further debugging