diff --git a/src/app/data.service.ts b/src/app/data.service.ts
index 122aa63..113e1a2 100644
--- a/src/app/data.service.ts
+++ b/src/app/data.service.ts
@@ -6,6 +6,7 @@ import { Player } from './model';
 })
 export class DataService {
   private players: Player[] = [];
+  teams: Player[][] = [];
 
   setPlayers(players: Player[]){
     for (let player of players){
diff --git a/src/app/model.ts b/src/app/model.ts
index 2608e7f..4aba7b2 100644
--- a/src/app/model.ts
+++ b/src/app/model.ts
@@ -26,7 +26,7 @@ export class Player{
     return [this.name, values];
   }
   
-  valueOf(): string{
+  toString(): string{
     return this.name;
   }
   static deSerialize(name: string, values: string): Player{
diff --git a/src/app/screen-basic/screen-basic.component.html b/src/app/screen-basic/screen-basic.component.html
index 9809c52..c84ccae 100644
--- a/src/app/screen-basic/screen-basic.component.html
+++ b/src/app/screen-basic/screen-basic.component.html
@@ -30,7 +30,7 @@
       </tr>
     </thead>
     <tbody>
-      @for (team of teamsArray; track $index) {
+      @for (team of data.teams; track $index) {
         <tr>
           <td style="text-wrap: wrap;">{{ team.length | number }}</td>
           <td class="wrap-cell">{{ team }}</td>
diff --git a/src/app/screen-basic/screen-basic.component.ts b/src/app/screen-basic/screen-basic.component.ts
index dbb0ea3..3d77c90 100644
--- a/src/app/screen-basic/screen-basic.component.ts
+++ b/src/app/screen-basic/screen-basic.component.ts
@@ -19,7 +19,6 @@ export class ScreenBasicComponent {
   numTeamsSelectorValue = "2";
   numTeamsSelected = 2;
   nTeamsValue = "4";
-  teamsArray: string[][] = [];
   
   onButtonGenerate(): void{
     if(this.numTeamsSelectorValue === 'n'){
@@ -40,10 +39,10 @@ export class ScreenBasicComponent {
         let n = localPlayers[index];
         localPlayers.splice(index,1);
         let team = iterator.next().value;
-        team.push(n.name);
+        team.push(n);
 
     }
-    this.teamsArray = teams;
+    this.data.teams = teams;
   }
 
 }
\ No newline at end of file