Revert "Revert "debug changes""

This reverts commit dd38a5671754e49af2300aecd83ae2e89326d780.