Included more debugging messages