diff --git a/app/models/match.rb b/app/models/match.rb
index ef0029b..e79738a 100644
--- a/app/models/match.rb
+++ b/app/models/match.rb
@@ -137,11 +137,11 @@ class Match < ActiveRecord::Base
 	end
 	
 	def swapWrestlers(wrestler1_id,wrestler2_id)
-		if self.m1 == wrestler1_id
-			self.m1 = wrestler2_id
+		if self.w1 == wrestler1_id
+			self.w1 = wrestler2_id
 			self.save
-		elsif self.m2 == wrestler1_id
-			self.m2 = wrestler2_id
+		elsif self.w2 == wrestler1_id
+			self.w2 = wrestler2_id
 			self.save
 		end
 		
diff --git a/app/models/tournament.rb b/app/models/tournament.rb
index 5f9fa52..67338a9 100644
--- a/app/models/tournament.rb
+++ b/app/models/tournament.rb
@@ -150,30 +150,25 @@ class Tournament < ActiveRecord::Base
  	    w3.criteria = w1.criteria
  	    w3.original_seed = w1.original_seed
  	    w3.seed = w1.seed
- 
+ 		swapWrestlerMatches(w1.allMatches,w1.id,w3.id)
   	    
  	    #Swap wrestler 1 and wrestler 2
- 	    w1.name = w2.name
- 	    w1.school_id = w2.school_id
- 	    w1.weight_id = w2.weight_id
- 	    w1.season_win = w2.season_win
- 	    w1.season_loss = w2.season_loss
- 	    w1.criteria = w2.criteria
- 	    w1.original_seed = w2.original_seed
+ 	    swapWrestlerMatches(w2.allMatches,w2.id,w1.id)
  	    w1.seed = w2.seed
 
   	    
- 	    w2.name = w3.name
- 	    w2.school_id = w3.school_id
- 	    w2.weight_id = w3.weight_id
- 	    w2.season_win = w3.season_win
- 	    w2.season_loss = w3.season_loss
- 	    w2.criteria = w3.criteria
- 	    w2.original_seed = w3.original_seed
+ 	    swapWrestlerMatches(w3.allMatches,w3.id,w2.id)
  	    w2.seed = w3.seed
 
   	    
   	    w1.save
   	    w2.save
 	end
+	
+	def swapWrestlerMatches(matchesToSwap,w1_id,w2_id)
+		matchesToSwap.each do |m|
+	    	m.swapWrestlers(w1_id,w2_id)
+	    end
+	end
+  	
 end