debugging improved