Refactored two-players