Refactored roster.