Revert "Revert "debugging...""

This reverts commit 2d056b81f938fa7ae60c5ff556ef15107f2f9321.