Debut refactor