diff --git a/src/cpuRepository.ts b/src/cpuRepository.ts
index 7ebecdf..471416d 100644
--- a/src/cpuRepository.ts
+++ b/src/cpuRepository.ts
@@ -21,14 +21,22 @@ export class CpuRepository {
     }
 
     getRandomCpu() {
-        let randomIndex = this.#getRandomInt(0, this.#cpuList.length);
+        let randomIndex: number;
+        do {
+            randomIndex = this.#getRandomInt(0, this.#cpuList.length);
+        } while (this.#cpuList[randomIndex]["value"] == null || this.#cpuList[randomIndex]["type"] == null)
         this.#cpuList[randomIndex]["name"] = this.#cpuList[randomIndex]["name"].split('@')[0];
         return this.#cpuList[randomIndex];
     }
 
-    #getRandomInt(min, max) {
+    #getRandomInt(min, max): number {
         min = Math.ceil(min);
         max = Math.floor(max);
         return Math.floor(Math.random() * (max - min) + min); // The maximum is exclusive and the minimum is inclusive
     }
+
+    nextRound(): void {
+        this.#currentCPU = this.#nextCPU
+        this.#nextCPU = this.getRandomCpu();
+    }
 }
\ No newline at end of file