further debug changes