Debut refactoring