The day after refactoring...