debugging after refactoring... see you tomorrow...