diff --git a/src/Player.php b/src/Player.php
index 414805c..2f5a514 100644
--- a/src/Player.php
+++ b/src/Player.php
@@ -211,28 +211,49 @@ class Player
     }
 
     /**
-     * Returns the points of the player.
+     * Returns the points of the player after round $round
      *
      * 1 Point is awarded for winning
      * 0.5 points are awarded for draw
+     * 0 points are awarded for loss
      *
+     * @param int $round
      * @return float
      */
-    public function calculatePoints(): float
+    public function calculatePoints(int $round = -1): float
     {
         $points = 0;
-        foreach ($this->Pairings as $pairing) {
-            if (array_search($pairing->Result, Constants::Won) !== false) {
-                $points = $points + 1;
-            } elseif (array_search($pairing->Result, Constants::Draw) !== false) {
-                $points = $points + 0.5;
+        foreach ($this->Pairings as $key=>$pairing) {
+            if($key < $round || $round == -1) {
+                if (array_search($pairing->Result, Constants::Won) !== false) {
+                    $points = $points + 1;
+                } elseif (array_search($pairing->Result, Constants::Draw) !== false) {
+                    $points = $points + 0.5;
+                }
             }
         }
         return $points;
     }
 
     /**
-     * Returns the points of the player that should be used for buchholz.
+     * Returns the points of a virtual player as described in the Fide Handbook C.02 chapter 13.15.2.
+     *
+     * 1 Point is awarded for winning
+     * 0.5 points are awarded for draw
+     * Unplayed results are conside
+     *
+     * @return float
+     */
+    public function calculatePointsForVirtualPlayer(int $byeround): float
+    {
+        $points = $this->calculatePoints($byeround);
+        foreach (array_slice($this->Pairings, $byeround +1) as $key=>$pairing) {
+            $points += 0.5;
+        }
+        return $points;
+    }
+    /**
+     * Returns the points of the player that should be used for tiebreaking systems.
      *
      * 1 Point is awarded for winning
      * 0.5 points are awarded for draw
@@ -240,7 +261,7 @@ class Player
      *
      * @return float
      */
-    private function pointsForBuchholz(): float
+    public function calculatePointsForTiebreaks(): float
     {
         $points = 0;
         foreach ($this->Pairings as $pairing) {
@@ -313,8 +334,6 @@ class Player
             return $this->playedGames();
         } elseif ($key == 'NoOfWins') {
             return $this->noOfWins();
-        } elseif ($key == 'PointsForBuchholz') {
-            return $this->pointsForBuchholz();
         } elseif (isset($this->BinaryData[$key])) {
             return $this->BinaryData[$key];
         }
diff --git a/src/Tournament.php b/src/Tournament.php
index b0cb249..c5c8a92 100644
--- a/src/Tournament.php
+++ b/src/Tournament.php
@@ -197,7 +197,7 @@ class Tournament
 
     /**
      * Binary data that was read out of the pairing file
-     * 
+     *
      * @var bool|DateTime|int|string[]
      */
     private $BinaryData = [];
@@ -813,14 +813,12 @@ class Tournament
         $intpairings = [];
         $curpoints = 0;
         $curround = 1;
-        foreach ($intpairingsWithBye as $pairing) {
+        foreach ($intpairingsWithBye as $key=>$pairing) {
             $roundstoplay = (count($intpairingsWithBye)) - $curround;
             if (is_null($pairing->Opponent)) {
-                $forfait = explode(' ', $pairing->Result)[0]+0;
-                $notaplayer = $curpoints + (1 - $forfait) + 0.5 * $roundstoplay;
-                $intpairings[] = $notaplayer;
+                $intpairings[] = $player->calculatePointsForVirtualPlayer($key);
             } else {
-                $intpairings[] = $pairing->Opponent->PointsForBuchholz;
+                $intpairings[] = $pairing->Opponent->calculatePointsForTiebreaks();
                 if (array_search($pairing->Result, Constants::Won) !== false) {
                     $curpoints += 1;
                 } elseif (array_search($pairing->Result, Constants::Draw) !== false) {
@@ -856,11 +854,14 @@ class Tournament
         foreach ($player->Pairings as $key => $pairing) {
             if ($pairing->Opponent) {
                 if (array_search($pairing->Result, Constants::Won) !== false) {
-                    $tiebreak += $pairing->Opponent->calculatePoints();
+                    $tiebreak += $pairing->Opponent->calculatePointsForTiebreaks();
                 } elseif (array_search($pairing->Result, Constants::Draw) !== false) {
-                    $tiebreak += $pairing->Opponent->calculatePoints() / 2;
+                    $tiebreak += $pairing->Opponent->calculatePointsForTiebreaks() / 2;
                 }
             }
+            if (array_search($pairing->Result, Constants::NotPlayed) !== false) {
+                $tiebreak += $player->calculatePointsForVirtualPlayer($key);
+            }
         }
         return $tiebreak;
     }