Add more debugging