Added a bit more debugging