diff --git a/app/models/tournament.rb b/app/models/tournament.rb
index 46c436c..317b5b1 100644
--- a/app/models/tournament.rb
+++ b/app/models/tournament.rb
@@ -8,14 +8,14 @@ class Tournament < ActiveRecord::Base
 	serialize :matchups_array
 
 	def upcomingMatches
-		@matches = generateMatchups
-		# if self.matchups_array
-		# 	return matchupHashesToObjects(self.matchups_array)
-		# else
-		# 	@matches = generateMatchups
-		#     saveMatchups(@matches)
-		#     return @matches
-		# end
+		# @matches = generateMatchups
+		if self.matchups_array
+			return matchupHashesToObjects(self.matchups_array)
+		else
+			@matches = generateMatchups
+		    saveMatchups(@matches)
+		    return @matches
+		end
 	end
 
 	def generateMatchups