Added more debugging