Added some more debugging