Adding some more debugging