diff --git a/app/models/match.rb b/app/models/match.rb
index 65e97f6..9e1fdee 100644
--- a/app/models/match.rb
+++ b/app/models/match.rb
@@ -111,7 +111,7 @@ class Match < ApplicationRecord
 			sec = time.partition(':').last.to_i
 			return minutes_in_seconds + sec
 		else
-			nil
+			0
 		end
 	end
 
diff --git a/app/models/wrestler.rb b/app/models/wrestler.rb
index 415dc45..908c030 100644
--- a/app/models/wrestler.rb
+++ b/app/models/wrestler.rb
@@ -38,7 +38,7 @@ class Wrestler < ApplicationRecord
 	end
 
 	def total_pool_points_for_pool_order
-      CalculateWrestlerTeamScore.new(self).poolPoints + CalculateWrestlerTeamScore.new(self).bonusWinPoints
+      CalculateWrestlerTeamScore.new(self).poolPoints + CalculateWrestlerTeamScore.new(self).pool_bonus_points
 	end
 
 	def unfinished_pool_matches
@@ -260,6 +260,7 @@ class Wrestler < ApplicationRecord
 	def pin_time_pool
       time = 0
       pin_wins.select{|m| m.bracket_position == "Pool"}.each do | m |
+		puts m.pin_time_in_seconds
       	time = time + m.pin_time_in_seconds
       end
       time
diff --git a/app/services/wrestler_services/calculate_wrestler_team_score.rb b/app/services/wrestler_services/calculate_wrestler_team_score.rb
index 9e6b378..c8ab8d5 100644
--- a/app/services/wrestler_services/calculate_wrestler_team_score.rb
+++ b/app/services/wrestler_services/calculate_wrestler_team_score.rb
@@ -43,6 +43,14 @@ class CalculateWrestlerTeamScore
         end
     end
 
+    def pool_bonus_points
+        if @tournament.tournament_type == "Pool to bracket"
+            (@wrestler.pin_wins.select{|m| m.bracket_position == "Pool"}.size * 2) + (@wrestler.tech_wins.select{|m| m.bracket_position == "Pool"}.size * 1.5) + (@wrestler.major_wins.select{|m| m.bracket_position == "Pool"}.size * 1)
+        else
+            0
+        end
+    end
+
     def byePoints
         points = 0
         if @tournament.tournament_type == "Pool to bracket"