Included more debugging