diff --git a/support_files/definitions/mexico/cup_apertura.xml b/support_files/definitions/mexico/cup_apertura.xml
new file mode 100644
index 00000000..e69de29b
diff --git a/support_files/definitions/mexico/cup_mexico1_apertura.xml b/support_files/definitions/mexico/cup_mexico1_apertura.xml
index bae6b0de..6a17a51c 100644
--- a/support_files/definitions/mexico/cup_mexico1_apertura.xml
+++ b/support_files/definitions/mexico/cup_mexico1_apertura.xml
@@ -4,9 +4,9 @@
 	<short_name>1a Apertura</short_name>
 	<sid>mexico1_apertura</sid>
 	<property>national</property>
-	<add_week>18</add_week>
+	<add_week>16</add_week>
 	<week_gap>1</week_gap>
-	<last_week>23</last_week>
+	<last_week>19</last_week>
 
 	
 	<cup_rounds>
@@ -14,15 +14,21 @@
 			<choose_teams>
 				<choose_team>
 					<choose_team_sid>mexico1</choose_team_sid>
-					<number_of_teams>8</number_of_teams>
+					<number_of_teams>10</number_of_teams>
 					<start_idx>1</start_idx>
-					<end_idx>8</end_idx>
+					<end_idx>10</end_idx>
 				</choose_team>
 			</choose_teams>
+			<two_match_week>1</two_match_week>
 		</cup_round>
 		<cup_round>
+			<two_match_week>1</two_match_week>
 		</cup_round>
 		<cup_round>
+			<two_match_week>1</two_match_week>
+		</cup_round>
+		<cup_round>
+			<two_match_week>1</two_match_week>
 		</cup_round>
 	</cup_rounds>
 </cup>
\ No newline at end of file
diff --git a/support_files/definitions/mexico/cup_mexico1_clausadura.xml b/support_files/definitions/mexico/cup_mexico1_clausadura.xml
new file mode 100644
index 00000000..69abaa2a
--- /dev/null
+++ b/support_files/definitions/mexico/cup_mexico1_clausadura.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cup>
+	<name>México Liga Primera Torneo Clausadura</name>
+	<short_name>México Clausadura</short_name>
+	<sid>mexico1_clausadura</sid>
+	<property>national</property>
+	<add_week>22</add_week>
+	<last_week>46</last_week>
+	
+	<cup_rounds>
+		<cup_round>
+			<randomise_teams>1</randomise_teams>
+			<number_of_groups>3</number_of_groups>
+			<number_of_advance>1</number_of_advance>
+			<number_of_best_advance>5</number_of_best_advance>
+			<round_robins>3</round_robins>
+			<choose_teams>
+				<choose_team>
+					<choose_team_sid>mexico1</choose_team_sid>
+				</choose_team>
+			</choose_teams>
+		</cup_round>
+		<cup_round>
+			<home_away>1</home_away>
+		</cup_round>
+		<cup_round>
+			<home_away>1</home_away>
+		</cup_round>
+		<cup_round>
+			<neutral>1</neutral>
+		</cup_round>
+	</cup_rounds>
+</cup>
diff --git a/support_files/definitions/mexico/cup_mexico1_clausura.xml b/support_files/definitions/mexico/cup_mexico1_clausura.xml
index 465d5c7a..d7ffe705 100644
--- a/support_files/definitions/mexico/cup_mexico1_clausura.xml
+++ b/support_files/definitions/mexico/cup_mexico1_clausura.xml
@@ -5,9 +5,9 @@
 	<sid>mexico1_clausura</sid>
 	<property>national</property>
 	<property>highlight3</property>
-	<add_week>43</add_week>
+	<add_week>41</add_week>
 	<week_gap>1</week_gap>
-	<last_week>48</last_week>
+	<last_week>44</last_week>
 	
 	
 	<cup_rounds>
@@ -15,15 +15,21 @@
 			<choose_teams>
 				<choose_team>
 					<choose_team_sid>mexico1</choose_team_sid>
-					<number_of_teams>8</number_of_teams>
+					<number_of_teams>10</number_of_teams>
 					<start_idx>1</start_idx>
-					<end_idx>8</end_idx>
+					<end_idx>10</end_idx>
 				</choose_team>
 			</choose_teams>
+			<two_match_week>1</two_match_week>
 		</cup_round>
 		<cup_round>
+			<two_match_week>1</two_match_week>
 		</cup_round>
 		<cup_round>
+			<two_match_week>1</two_match_week>
+		</cup_round>
+		<cup_round>
+			<two_match_week>1</two_match_week>
 		</cup_round>
 	</cup_rounds>
 </cup>
\ No newline at end of file
diff --git a/support_files/definitions/mexico/cup_mexico2_apertura.xml b/support_files/definitions/mexico/cup_mexico2_apertura.xml
index fcf0928d..150ce080 100644
--- a/support_files/definitions/mexico/cup_mexico2_apertura.xml
+++ b/support_files/definitions/mexico/cup_mexico2_apertura.xml
@@ -4,30 +4,27 @@
 	<short_name>1a "a" Apertura</short_name>
 	<sid>mexico2_apertura</sid>
 	<property>national</property>
-	<add_week>20</add_week>
+	<add_week>17</add_week>
 	<week_gap>1</week_gap>
-	<last_week>23</last_week>
+	<last_week>19</last_week>
 	
 	<cup_rounds>
 		<cup_round>
-			<home_away>0</home_away>
 			<choose_teams>
 				<choose_team>
 					<choose_team_sid>mexico2</choose_team_sid>
-					<number_of_teams>10</number_of_teams>
+					<number_of_teams>8</number_of_teams>
 					<start_idx>1</start_idx>
-					<end_idx>10</end_idx>
+					<end_idx>8</end_idx>
 				</choose_team>
 			</choose_teams>
+			<two_match_week>1</two_match_week>
 		</cup_round>
 		<cup_round>
-			<home_away>0</home_away>
+			<two_match_week>1</two_match_week>
 		</cup_round>
 		<cup_round>
-			<home_away>0</home_away>
-		</cup_round>
-		<cup_round>
-			<home_away>0</home_away>
+			<two_match_week>1</two_match_week>
 		</cup_round>
 	</cup_rounds>
 </cup>
\ No newline at end of file
diff --git a/support_files/definitions/mexico/cup_mexico2_clausura.xml b/support_files/definitions/mexico/cup_mexico2_clausura.xml
index ea86ced2..4ff56677 100644
--- a/support_files/definitions/mexico/cup_mexico2_clausura.xml
+++ b/support_files/definitions/mexico/cup_mexico2_clausura.xml
@@ -5,30 +5,27 @@
 	<sid>mexico2_clausura</sid>
 	<property>national</property>
 	<property>highlight3</property>
-	<add_week>46</add_week>
+	<add_week>42</add_week>
 	<week_gap>1</week_gap>
-	<last_week>49</last_week>
+	<last_week>44</last_week>
 	
 	<cup_rounds>
 		<cup_round>
-			<home_away>0</home_away>
 			<choose_teams>
 				<choose_team>
 					<choose_team_sid>mexico2</choose_team_sid>
-					<number_of_teams>10</number_of_teams>
+					<number_of_teams>8</number_of_teams>
 					<start_idx>1</start_idx>
-					<end_idx>10</end_idx>
+					<end_idx>8</end_idx>
 				</choose_team>
 			</choose_teams>
+			<two_match_week>1</two_match_week>
 		</cup_round>
 		<cup_round>
-			<home_away>0</home_away>
+			<two_match_week>1</two_match_week>
 		</cup_round>
 		<cup_round>
-			<home_away>0</home_away>
-		</cup_round>
-		<cup_round>
-			<home_away>0</home_away>
+			<two_match_week>1</two_match_week>
 		</cup_round>
 	</cup_rounds>
 </cup>
\ No newline at end of file
diff --git a/support_files/definitions/mexico/cup_mexico3_apertura.xml b/support_files/definitions/mexico/cup_mexico3_apertura.xml
index b8334d64..e702b1d0 100644
--- a/support_files/definitions/mexico/cup_mexico3_apertura.xml
+++ b/support_files/definitions/mexico/cup_mexico3_apertura.xml
@@ -4,9 +4,9 @@
 	<short_name>2a Apertura</short_name>
 	<sid>mexico3_apertura</sid>
 	<property>national</property>
-	<add_week>20</add_week>
+	<add_week>16</add_week>
 	<week_gap>1</week_gap>
-	<last_week>27</last_week>
+	<last_week>19</last_week>
 	
 	<cup_rounds>
 		<cup_round>
@@ -48,12 +48,16 @@
 					<end_idx>2</end_idx>
 				</choose_team>
 			</choose_teams>
+			<two_match_week>1</two_match_week>
 		</cup_round>
 		<cup_round>
+			<two_match_week>1</two_match_week>
 		</cup_round>
 		<cup_round>
+			<two_match_week>1</two_match_week>
 		</cup_round>
 		<cup_round>
+			<two_match_week>1</two_match_week>
 		</cup_round>
 	</cup_rounds>
 </cup>
\ No newline at end of file
diff --git a/support_files/definitions/mexico/cup_mexico3_clausura.xml b/support_files/definitions/mexico/cup_mexico3_clausura.xml
index ff4c98ca..89a17f78 100644
--- a/support_files/definitions/mexico/cup_mexico3_clausura.xml
+++ b/support_files/definitions/mexico/cup_mexico3_clausura.xml
@@ -7,7 +7,7 @@
 	<property>highlight3</property>
 	<add_week>41</add_week>
 	<week_gap>1</week_gap>
-	<last_week>46</last_week>
+	<last_week>44</last_week>
 	
 	<cup_rounds>
 		<cup_round>
@@ -49,12 +49,16 @@
 					<end_idx>2</end_idx>
 				</choose_team>
 			</choose_teams>
+			<two_match_week>1</two_match_week>
 		</cup_round>
 		<cup_round>
+			<two_match_week>1</two_match_week>
 		</cup_round>
 		<cup_round>
+			<two_match_week>1</two_match_week>
 		</cup_round>
 		<cup_round>
+			<two_match_week>1</two_match_week>
 		</cup_round>
 	</cup_rounds>
 </cup>
\ No newline at end of file
diff --git a/support_files/definitions/mexico/cup_mexico_superliga.xml b/support_files/definitions/mexico/cup_mexico_superliga.xml
index aa10276d..88c1be8d 100644
--- a/support_files/definitions/mexico/cup_mexico_superliga.xml
+++ b/support_files/definitions/mexico/cup_mexico_superliga.xml
@@ -37,6 +37,7 @@
 				<generate>1</generate>
 			</choose_team>
 		</choose_teams>
+		<two_match_week>1</two_match_week>
 	</cup_round>
 	<cup_round>
 		<home_away>0</home_away>
diff --git a/support_files/definitions/mexico/cup_prom_games_mexico2.xml b/support_files/definitions/mexico/cup_prom_games_mexico2.xml
index ae676e8a..baafff33 100644
--- a/support_files/definitions/mexico/cup_prom_games_mexico2.xml
+++ b/support_files/definitions/mexico/cup_prom_games_mexico2.xml
@@ -1,55 +1,78 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cup>
-	<name>Promocion a 1a "a"</name>
-	<short_name>1a "a" Promocion</short_name>
+	<name>Segunda Division Torneo Clausura</name>
+	<short_name>2a Clausura</short_name>
+	<!--<name>Promocion a 1a "a"</name>
+	<short_name>1a "a" Promocion</short_name>-->
 	<sid>prom_games_mexico2</sid>
 	<property>promotion</property>
 	<property>highlight2</property>
-	<add_week>47</add_week>
+	<group>1620</group>
+	<add_week>1000</add_week>
 	<week_gap>1</week_gap>
 	<last_week>48</last_week>
 	
 	<cup_rounds>
 		<cup_round>
-			<byes>0</byes>
 			<choose_teams>
 				<choose_team>
-					<choose_team_sid>mexico3-1</choose_team_sid>
-					<number_of_teams>1</number_of_teams>
+					<choose_team_sid>mexico3-5</choose_team_sid>
+					<number_of_teams>3</number_of_teams>
 					<start_idx>1</start_idx>
-					<end_idx>1</end_idx>
-				</choose_team>
-				<choose_team>
-					<choose_team_sid>mexico3-2</choose_team_sid>
-					<number_of_teams>1</number_of_teams>
-					<start_idx>1</start_idx>
-					<end_idx>1</end_idx>
+					<end_idx>3</end_idx>
 				</choose_team>
 				<choose_team>
 					<choose_team_sid>mexico3-3</choose_team_sid>
-					<number_of_teams>1</number_of_teams>
+					<number_of_teams>4</number_of_teams>
 					<start_idx>1</start_idx>
-					<end_idx>1</end_idx>
+					<end_idx>4</end_idx>
+				</choose_team>
+				<choose_team>
+					<choose_team_sid>mexico3-1</choose_team_sid>
+					<number_of_teams>1</number_of_teams>
+					<start_idx>3</start_idx>
+					<end_idx>3</end_idx>
 				</choose_team>
 				<choose_team>
 					<choose_team_sid>mexico3-4</choose_team_sid>
-					<number_of_teams>1</number_of_teams>
+					<number_of_teams>3</number_of_teams>
 					<start_idx>1</start_idx>
-					<end_idx>1</end_idx>
+					<end_idx>3</end_idx>
 				</choose_team>
 				<choose_team>
-					<choose_team_sid>mexico3-5</choose_team_sid>
-					<number_of_teams>1</number_of_teams>
+					<choose_team_sid>mexico3-2</choose_team_sid>
+					<number_of_teams>3</number_of_teams>
 					<start_idx>1</start_idx>
-					<end_idx>1</end_idx>
+					<end_idx>3</end_idx>
 				</choose_team>
 				<choose_team>
-					<choose_team_sid>mexico2</choose_team_sid>
-					<number_of_teams>5</number_of_teams>
-					<start_idx>16</start_idx>
-					<end_idx>20</end_idx>
+					<choose_team_sid>mexico3-1</choose_team_sid>
+					<number_of_teams>2</number_of_teams>
+					<start_idx>1</start_idx>
+					<end_idx>2</end_idx>
 				</choose_team>
 			</choose_teams>
+			<two_match_week>1</two_match_week>
+		</cup_round>
+		<cup_round>
+			<two_match_week>1</two_match_week>
+		</cup_round>
+		<cup_round>
+			<two_match_week>1</two_match_week>
+		</cup_round>
+		<cup_round>
+			<two_match_week>1</two_match_week>
+		</cup_round>
+		<cup_round>
+			<choose_teams>
+				<choose_team>
+					<choose_team_sid>mexico2</choose_team_sid>
+					<number_of_teams>1</number_of_teams>
+					<start_idx>24</start_idx>
+					<end_idx>24</end_idx>
+				</choose_team>
+			</choose_teams>
+			<two_match_week>1</two_match_week>
 		</cup_round>
 	</cup_rounds>
 </cup>
\ No newline at end of file
diff --git a/support_files/definitions/mexico/league_mexico1.xml b/support_files/definitions/mexico/league_mexico1.xml
index 178ccfc4..210bb754 100644
--- a/support_files/definitions/mexico/league_mexico1.xml
+++ b/support_files/definitions/mexico/league_mexico1.xml
@@ -11,7 +11,13 @@
 	<yellow_red>3</yellow_red>
 	<round_robins>2</round_robins>
 	<names_file>latinoamerica</names_file>
-	<break>9</break>
+	<break>11</break>
+	<two_match_week_start>3</two_match_week_start>
+	<two_match_week_end>6</two_match_week_end>
+	<two_match_week_start>20</two_match_week_start>
+	<two_match_week_end>21</two_match_week_end>
+	<two_match_week_start>23</two_match_week_start>
+	<two_match_week_end>24</two_match_week_end>
 	
 	<prom_rel>
 		<prom_rel_element>
@@ -45,7 +51,7 @@
 			<team_name>N. Aguascalientes</team_name>
 		</team>
 		<team>
-			<team_name>U.A.G. Zapopan</team_name>
+			<team_name>U.A.G. Zapopán</team_name>
 		</team>
 		<team>
 			<team_name>Monterrey T.</team_name>
diff --git a/support_files/definitions/mexico/league_mexico2.xml b/support_files/definitions/mexico/league_mexico2.xml
index 1637e21a..0a768ab6 100644
--- a/support_files/definitions/mexico/league_mexico2.xml
+++ b/support_files/definitions/mexico/league_mexico2.xml
@@ -11,13 +11,17 @@
 	<yellow_red>3</yellow_red>
 	<round_robins>2</round_robins>
 	<names_file>latinoamerica</names_file>
-	<break>8</break>
+	<break>10</break>
+	<two_match_week_start>3</two_match_week_start>
+	<two_match_week_end>16</two_match_week_end>
+	<two_match_week_start>26</two_match_week_start>
+	<two_match_week_end>39</two_match_week_end>
 	
 	<prom_rel>
 		<prom_games>
 			<prom_games_dest_sid>mexico2</prom_games_dest_sid>
 			<prom_games_loser_sid>mexico3-1 mexico3-2 mexico3-3 mexico3-4 mexico3-5</prom_games_loser_sid>
-			<prom_games_number_of_advance>5</prom_games_number_of_advance>
+			<prom_games_number_of_advance>1</prom_games_number_of_advance>
 			<prom_games_cup_sid>prom_games_mexico2</prom_games_cup_sid>
 		</prom_games>
 		
@@ -31,64 +35,76 @@
 	
 	<teams>
 		<team>
-			<team_name>D. Sinaloa</team_name>
+			<team_name>Zapotlanejo A.</team_name>
 		</team>
 		<team>
-			<team_name>Ciudad Victoria C.</team_name>
-		</team>
-		<team>
-			<team_name>Tepic C.C.</team_name>
-		</team>
-		<team>
-			<team_name>C.A. Oaxaca</team_name>
-		</team>
-		<team>
-			<team_name>Ciudad Juárez I.</team_name>
-		</team>
-		<team>
-			<team_name>León</team_name>
-		</team>
-		<team>
-			<team_name>Salamanca P.</team_name>
-		</team>
-		<team>
-			<team_name>Monterrey R.</team_name>
-		</team>
-		<team>
-			<team_name>Tampico M.</team_name>
-		</team>
-		<team>
-			<team_name>Puebla L,</team_name>
-		</team>
-		<team>
-			<team_name>Toluca A.M.</team_name>
+			<team_name>Culiacán D.S.</team_name>
 		</team>
 		<team>
 			<team_name>Durango</team_name>
 		</team>
 		<team>
-			<team_name>Villahermosa T.</team_name>
+			<team_name>León</team_name>
 		</team>
 		<team>
-			<team_name>Zacatepec</team_name>
+			<team_name>Morelia M.A.</team_name>
 		</team>
 		<team>
-			<team_name>Coatzacoalcos</team_name>
+			<team_name>P.R. Colima</team_name>
 		</team>
 		<team>
-			<team_name>Hermosillo C.S.</team_name>
+			<team_name>Celaya</team_name>
 		</team>
 		<team>
-			<team_name>Los Mochis T.</team_name>
+			<team_name>P. Salamanca</team_name>
 		</team>
 		<team>
-			<team_name>Irapuato</team_name>
+			<team_name>Torreón S.L.A.</team_name>
+		</team>
+		<team>
+			<team_name>Guadalajara T.</team_name>
+		</team>
+		<team>
+			<team_name>U.A.G. Zapopán A.</team_name>
+		</team>
+		<team>
+			<team_name>T. Los Mochis</team_name>
+		</team>
+		<team>
+			<team_name>Toluca A.M.</team_name>
+		</team>
+		<team>
+			<team_name>C.A. Hidalgo</team_name>
+		</team>
+		<team>
+			<team_name>I. Ciudad Juárez</team_name>
+		</team>
+		<team>
+			<team_name>Puebla L.B.</team_name>
+		</team>
+		<team>
+			<team_name>Monterrey R.A.</team_name>
 		</team>
 		<team>
 			<team_name>Puebla</team_name>
 		</team>
 		<team>
-			<team_name>C.F.P. Anáhuac</team_name>
+			<team_name>Cuernavaca P.M.</team_name>
+		</team>
+		<team>
+			<team_name>Tijuana X.C.</team_name>
+		</team>
+		<team>
+			<team_name>Tampico M.F.</team_name>
+		</team>
+		<team>
+			<team_name>Coatzacoalcos T.R.</team_name>
+		</team>
+		<team>
+			<team_name>Ciudad Victoria C.</team_name>
+		</team>
+		<team>
+			<team_name>México City S.A.</team_name>
 		</team>
 	</teams>
 </league>
\ No newline at end of file
diff --git a/support_files/definitions/mexico/league_mexico3-1.xml b/support_files/definitions/mexico/league_mexico3-1.xml
index 893c2f93..42923c4e 100644
--- a/support_files/definitions/mexico/league_mexico3-1.xml
+++ b/support_files/definitions/mexico/league_mexico3-1.xml
@@ -5,13 +5,13 @@
 	<short_name>2a Bajio</short_name>
 	<symbol>flag_mexico.png</symbol>
 	<layer>3</layer>
-	<first_week>6</first_week>
+	<first_week>3</first_week>
 	<week_gap>1</week_gap>
 	<average_talent>6500</average_talent>
 	<yellow_red>3</yellow_red>
 	<round_robins>2</round_robins>
 	<names_file>latinoamerica</names_file>
-	<break>10</break>
+	<break>13</break>
 	
 	<teams>
 		<team>
diff --git a/support_files/definitions/mexico/league_mexico3-2.xml b/support_files/definitions/mexico/league_mexico3-2.xml
index 508e5018..21d5c290 100644
--- a/support_files/definitions/mexico/league_mexico3-2.xml
+++ b/support_files/definitions/mexico/league_mexico3-2.xml
@@ -5,13 +5,13 @@
 	<short_name>2a Norte</short_name>
 	<symbol>flag_mexico.png</symbol>
 	<layer>3</layer>
-	<first_week>8</first_week>
+	<first_week>5</first_week>
 	<week_gap>1</week_gap>
 	<average_talent>6450</average_talent>
 	<yellow_red>3</yellow_red>
 	<round_robins>2</round_robins>
 	<names_file>latinoamerica</names_file>
-	<break>12</break>
+	<break>15</break>
 	
 	<teams>
 		<team>
diff --git a/support_files/definitions/mexico/league_mexico3-3.xml b/support_files/definitions/mexico/league_mexico3-3.xml
index d427be27..0a5edd32 100644
--- a/support_files/definitions/mexico/league_mexico3-3.xml
+++ b/support_files/definitions/mexico/league_mexico3-3.xml
@@ -5,13 +5,13 @@
 	<short_name>2a Centro</short_name>
 	<symbol>flag_mexico.png</symbol>
 	<layer>3</layer>
-	<first_week>4</first_week>
+	<first_week>1</first_week>
 	<week_gap>1</week_gap>
 	<average_talent>6575</average_talent>
 	<yellow_red>3</yellow_red>
 	<round_robins>2</round_robins>
 	<names_file>latinoamerica</names_file>
-	<break>8</break>
+	<break>11</break>
 	
 	<teams>
 		<team>
diff --git a/support_files/definitions/mexico/league_mexico3-4.xml b/support_files/definitions/mexico/league_mexico3-4.xml
index 8a3f55cf..745e3e15 100644
--- a/support_files/definitions/mexico/league_mexico3-4.xml
+++ b/support_files/definitions/mexico/league_mexico3-4.xml
@@ -5,13 +5,13 @@
 	<short_name>2a Occidente</short_name>
 	<symbol>flag_mexico.png</symbol>
 	<layer>3</layer>
-	<first_week>6</first_week>
+	<first_week>3</first_week>
 	<week_gap>1</week_gap>
 	<average_talent>6500</average_talent>
 	<yellow_red>3</yellow_red>
 	<round_robins>2</round_robins>
 	<names_file>latinoamerica</names_file>
-	<break>10</break>
+	<break>13</break>
 	
 	<teams>
 		<team>
diff --git a/support_files/definitions/mexico/league_mexico3-5.xml b/support_files/definitions/mexico/league_mexico3-5.xml
index bc4d2133..ef000391 100644
--- a/support_files/definitions/mexico/league_mexico3-5.xml
+++ b/support_files/definitions/mexico/league_mexico3-5.xml
@@ -5,13 +5,13 @@
 	<short_name>2a Sur</short_name>
 	<symbol>flag_mexico.png</symbol>
 	<layer>3</layer>
-	<first_week>8</first_week>
+	<first_week>5</first_week>
 	<week_gap>1</week_gap>
 	<average_talent>6400</average_talent>
 	<yellow_red>3</yellow_red>
 	<round_robins>2</round_robins>
 	<names_file>latinoamerica</names_file>
-	<break>12</break>
+	<break>15</break>
 	
 	<teams>
 		<team>