Updated to get more debugging info