included more debugging code