little debugging after large refactoring