again: move debug code