diff --git a/app/services/wrestler_services/swap_wrestlers.rb b/app/services/wrestler_services/swap_wrestlers.rb
index 25cf5d8..d456fbd 100644
--- a/app/services/wrestler_services/swap_wrestlers.rb
+++ b/app/services/wrestler_services/swap_wrestlers.rb
@@ -3,53 +3,52 @@ class SwapWrestlers
 
     
     def swap_wrestlers_bracket_lines(wrestler1_id,wrestler2_id)
-	    w1 = Wrestler.find(wrestler1_id)
-	    w2 = Wrestler.find(wrestler2_id)
-	    weight_matches = w1.weight.matches
-	    
-	    #placeholder guy
- 	    w3 = Wrestler.new
- 	    w3.weight_id = w1.weight_id
- 	    w3.original_seed = w1.original_seed
- 	    w3.bracket_line = w1.bracket_line
- 	    w3.pool = w1.pool
- 		weight_matches = swapWrestlerMatches(weight_matches,w1.id,w3.id)
-  	    
- 	    #Swap wrestler 1 and wrestler 2
- 	    weight_matches = swapWrestlerMatches(weight_matches,w2.id,w1.id)
- 	    w1.bracket_line = w2.bracket_line
- 	    w1.pool = w2.pool
+      w1 = Wrestler.find(wrestler1_id)
+      w2 = Wrestler.find(wrestler2_id)
+      w1_matches = w1.all_matches
+      w2_matches = w2.all_matches
+      
+      #placeholder guy for w1
+      w3 = Wrestler.new
+      w3.weight_id = w1.weight_id
+      w3.original_seed = w1.original_seed
+      w3.bracket_line = w1.bracket_line
+      w3.pool = w1.pool
+      
+      # placeholder guy for w2
+      w4 = Wrestler.new
+      w4.weight_id = w2.weight_id
+      w4.original_seed = w2.original_seed
+      w4.bracket_line = w2.bracket_line
+      w4.pool = w2.pool
+      
+      # swap w4 line and pool to w1
+      w1.bracket_line = w4.bracket_line
+      w1.pool = w4.pool
 
-  	    
- 	    weight_matches = swapWrestlerMatches(weight_matches,w3.id,w2.id)
- 	    w2.bracket_line = w3.bracket_line
- 	    w2.pool = w3.pool
+     # swap w3 line and pool to w2
+      w2.bracket_line = w3.bracket_line
+      w2.pool = w3.pool
+      
+      # Swap matches
+      swapWrestlerMatches(w1_matches,w1.id,w2.id)
+      swapWrestlerMatches(w2_matches,w2.id,w1.id)
 
-  	    save_matches(weight_matches)
-  	    w1.save
-  	    w2.save
-	end
-
-	def save_matches(matches)
-        matches.each do |match|
-        	match.save
-        end
+      w1.save
+      w2.save
+  end
+  
+  def swapWrestlerMatches(matchesToSwap,from_id,to_id)
+    matchesToSwap.each do |m|
+          if m.w1 == from_id
+              m.w1 = to_id
+          elsif m.w2 == from_id
+              m.w2 = to_id
+          end
+          if m.winner_id == from_id
+              m.winner_id = to_id
+          end
+          m.save
     end
-	
-	def swapWrestlerMatches(matchesToSwap,from_id,to_id)
-		matchesToSwap.select{|m| m.w1 == from_id or m.w2 == from_id}.each do |m|
-			# if m.bracket_position == "Pool" or (m.bracket_position == "Bracket" and m.round == 1)
-			    if m.w1 == from_id
-        			m.w1 = to_id
-        		elsif m.w2 == from_id
-        			m.w2 = to_id
-        		end
-        		if m.winner_id == from_id
-        			m.winner_id = to_id
-        		end
-        		# m.save
-	    	# end
-	    end
-	    return matchesToSwap
-	end
-end
+  end
+end
\ No newline at end of file
diff --git a/app/views/tournaments/bracket.html.erb b/app/views/tournaments/bracket.html.erb
index 1817b7a..b0c438c 100644
--- a/app/views/tournaments/bracket.html.erb
+++ b/app/views/tournaments/bracket.html.erb
@@ -3,6 +3,6 @@
 <% end %>
 <% if @tournament.tournament_type == "Pool to bracket" %> 
   <%= render 'pool_bracket_director_actions' %>
-<% elsif @tournament.tournament_type == "Modified 16 Man Double Elimination" %>
+<% elsif @tournament.tournament_type == "Modified 16 Man Double Elimination" or @tournament.tournament_type == "Double Elimination 1-6" %>
   <%= render 'bracket_director_actions' %>
 <% end %>
\ No newline at end of file