Additional changes for further debugging.