Added some more debugging code