Added even more debugging