Reverted changes for team play