diff --git a/support_files/definitions/south_america/americas/cup_libertadores.xml b/support_files/definitions/south_america/americas/cup_libertadores.xml
index a90e0f22..d6e1018c 100644
--- a/support_files/definitions/south_america/americas/cup_libertadores.xml
+++ b/support_files/definitions/south_america/americas/cup_libertadores.xml
@@ -14,6 +14,7 @@
 	<property>highlight1</property>
 	<cup_rounds>
 		<cup_round>
+			<delay>-5</delay>
 			<byes>0</byes>
 			<new_teams>12</new_teams>
 			<round_name>Pre Copa</round_name>
@@ -109,6 +110,7 @@
 			</choose_teams>
 		</cup_round>
 		<cup_round>
+			<delay>-4</delay>
 			<number_of_groups>8</number_of_groups>
 			<number_of_advance>2</number_of_advance>
 			<new_teams>26</new_teams>
@@ -212,10 +214,13 @@
 			</choose_teams>
 		</cup_round>
 		<cup_round>
+			<delay>-3</delay>
 		</cup_round>
 		<cup_round>
+			<delay>-2</delay>
 		</cup_round>
 		<cup_round>
+			<delay>-1</delay>
 		</cup_round>
 		<cup_round>
 		</cup_round>
diff --git a/support_files/definitions/south_america/americas/cup_libertadores_ab.xml b/support_files/definitions/south_america/americas/cup_libertadores_ab.xml
index 2d62105c..23346e1c 100755
--- a/support_files/definitions/south_america/americas/cup_libertadores_ab.xml
+++ b/support_files/definitions/south_america/americas/cup_libertadores_ab.xml
@@ -14,6 +14,7 @@
 	<property>highlight1</property>
 	<cup_rounds>
 		<cup_round>
+			<delay>-5</delay>
 			<byes>0</byes>
 			<new_teams>12</new_teams>
 			<round_name>Pre Copa</round_name>
@@ -110,6 +111,7 @@
 			</choose_teams>
 		</cup_round>
 		<cup_round>
+			<delay>-4</delay>
 			<number_of_groups>8</number_of_groups>
 			<number_of_advance>2</number_of_advance>
 			<new_teams>26</new_teams>
@@ -213,10 +215,13 @@
 			</choose_teams>
 		</cup_round>
 		<cup_round>
+			<delay>-3</delay>
 		</cup_round>
 		<cup_round>
+			<delay>-2</delay>
 		</cup_round>
 		<cup_round>
+			<delay>-1</delay>
 		</cup_round>
 		<cup_round>
 		</cup_round>
diff --git a/support_files/definitions/south_america/americas/cup_mundial_clubes.xml b/support_files/definitions/south_america/americas/cup_mundial_clubes.xml
index babbad02..84d7ece8 100755
--- a/support_files/definitions/south_america/americas/cup_mundial_clubes.xml
+++ b/support_files/definitions/south_america/americas/cup_mundial_clubes.xml
@@ -38,7 +38,7 @@
 					<randomly>1</randomly>
 					<generate>1</generate>
 					<start_idx>1</start_idx>
-					<end_idx>4</end_idx>
+					<end_idx>6</end_idx>
 				</choose_team>
 				<choose_team>
 					<choose_team_sid>japan1</choose_team_sid>
@@ -46,7 +46,7 @@
 					<randomly>1</randomly>
 					<generate>1</generate>
 					<start_idx>1</start_idx>
-					<end_idx>4</end_idx>
+					<end_idx>6</end_idx>
 				</choose_team>
 			</choose_teams>
 		</cup_round>
diff --git a/support_files/definitions/south_america/americas/cup_mundial_clubes_ab.xml b/support_files/definitions/south_america/americas/cup_mundial_clubes_ab.xml
index c8d77f7b..e1d21512 100755
--- a/support_files/definitions/south_america/americas/cup_mundial_clubes_ab.xml
+++ b/support_files/definitions/south_america/americas/cup_mundial_clubes_ab.xml
@@ -38,7 +38,7 @@
 					<randomly>1</randomly>
 					<generate>1</generate>
 					<start_idx>1</start_idx>
-					<end_idx>4</end_idx>
+					<end_idx>6</end_idx>
 				</choose_team>
 				<choose_team>
 					<choose_team_sid>japan1</choose_team_sid>
@@ -46,7 +46,7 @@
 					<randomly>1</randomly>
 					<generate>1</generate>
 					<start_idx>1</start_idx>
-					<end_idx>4</end_idx>
+					<end_idx>6</end_idx>
 				</choose_team>
 			</choose_teams>
 		</cup_round>
diff --git a/support_files/definitions/south_america/americas/cup_sudamericana.xml b/support_files/definitions/south_america/americas/cup_sudamericana.xml
index ea7f0b35..569a5200 100644
--- a/support_files/definitions/south_america/americas/cup_sudamericana.xml
+++ b/support_files/definitions/south_america/americas/cup_sudamericana.xml
@@ -14,6 +14,7 @@
 	<property>highlight2</property>
 	<cup_rounds>
 		<cup_round>
+			<delay>-5</delay>
 			<byes>0</byes>
 			<new_teams>8</new_teams>
 			<choose_teams>  
@@ -90,6 +91,7 @@
 			</choose_teams>
 		</cup_round>
 		<cup_round>
+			<delay>-4</delay>
 			<byes>0</byes>
 			<new_teams>20</new_teams>
 			<choose_teams>  
@@ -177,6 +179,7 @@
 			</choose_teams>
 		</cup_round>
 		<cup_round>
+			<delay>-3</delay>
 			<byes>0</byes>
 			<new_teams>4</new_teams>
 			<choose_teams>  
@@ -199,8 +202,10 @@
 			</choose_teams>
 		</cup_round>
 		<cup_round>
+			<delay>-2</delay>
 		</cup_round>
 		<cup_round>
+			<delay>-1</delay>
 		</cup_round>
 		<cup_round>
 		</cup_round>
diff --git a/support_files/definitions/south_america/americas/cup_sudamericana_ab.xml b/support_files/definitions/south_america/americas/cup_sudamericana_ab.xml
index c701af33..8a4c679e 100755
--- a/support_files/definitions/south_america/americas/cup_sudamericana_ab.xml
+++ b/support_files/definitions/south_america/americas/cup_sudamericana_ab.xml
@@ -14,6 +14,7 @@
 	<property>highlight2</property>
 	<cup_rounds>
 		<cup_round>
+			<delay>-5</delay>
 			<byes>0</byes>
 			<new_teams>8</new_teams>
 			<choose_teams>  
@@ -91,6 +92,7 @@
 			</choose_teams>
 		</cup_round>
 		<cup_round>
+			<delay>-4</delay>
 			<byes>0</byes>
 			<new_teams>20</new_teams>
 			<choose_teams>  
@@ -178,6 +180,7 @@
 			</choose_teams>
 		</cup_round>
 		<cup_round>
+			<delay>-3</delay>
 			<byes>0</byes>
 			<new_teams>4</new_teams>
 			<choose_teams>  
@@ -200,8 +203,10 @@
 			</choose_teams>
 		</cup_round>
 		<cup_round>
+			<delay>-2</delay>
 		</cup_round>
 		<cup_round>
+			<delay>-1</delay>
 		</cup_round>
 		<cup_round>
 		</cup_round>
diff --git a/support_files/definitions/south_america/argentina/country_argentina.xml b/support_files/definitions/south_america/argentina/country_argentina.xml
index 43c1fcc8..33637fa6 100644
--- a/support_files/definitions/south_america/argentina/country_argentina.xml
+++ b/support_files/definitions/south_america/argentina/country_argentina.xml
@@ -9,6 +9,8 @@
 		<league>argentina2</league>
 		<league>argentina3a</league>
 		<league>argentina3b</league>
+		<league>argentina4a</league>
+		<league>argentina4b</league>
 	</leagues>
 	<cups>
 		<cup>libertadores_ab</cup>
@@ -16,8 +18,13 @@
 		<cup>recopa_ab</cup>
 		<cup>mundial_clubes_ab</cup>
 		<cup>reducido</cup>
+		<cup>reducido_1c</cup>
 		<cup>argentino_a_fase1</cup>
 		<cup>argentino_a_fase2</cup>
 		<cup>argentino_a_final</cup>
+		<cup>argentino_a_descenso</cup>
+		<cup>argentino_b_fase1</cup>
+		<cup>argentino_b_fase2</cup>
+		<cup>argentino_b_final</cup>
 	</cups>
 </country>
diff --git a/support_files/definitions/south_america/argentina/cup_argentino_a_descenso.xml b/support_files/definitions/south_america/argentina/cup_argentino_a_descenso.xml
new file mode 100644
index 00000000..c8082a55
--- /dev/null
+++ b/support_files/definitions/south_america/argentina/cup_argentino_a_descenso.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cup>
+	<name>Descenso Argentino A-B</name>
+	<short_name>Descenso Argentino A-B</short_name>
+	<symbol>flag_argentina.png</symbol>
+	<sid>argentino_a_descenso</sid>
+	<add_week>37</add_week>
+	<last_week>48</last_week>
+	<property>promotion</property>
+	<week_gap>1</week_gap>
+	<property>national</property>
+	<property>highlight3</property>
+	<property>omit_from_history</property>
+	<cup_rounds>
+		<cup_round>
+			<choose_teams>
+				<choose_team>
+					<choose_team_sid>argentino_a_fase1</choose_team_sid>
+					<number_of_teams>4</number_of_teams>
+					<start_idx>21</start_idx>
+					<end_idx>24</end_idx>
+				</choose_team>
+			</choose_teams>
+		</cup_round>
+	</cup_rounds>
+</cup>
diff --git a/support_files/definitions/south_america/argentina/cup_argentino_a_fase1.xml b/support_files/definitions/south_america/argentina/cup_argentino_a_fase1.xml
index 4229c50e..c2d1ec25 100644
--- a/support_files/definitions/south_america/argentina/cup_argentino_a_fase1.xml
+++ b/support_files/definitions/south_america/argentina/cup_argentino_a_fase1.xml
@@ -5,7 +5,7 @@
 	<symbol>flag_argentina.png</symbol>
 	<sid>argentino_a_fase1</sid>
 	<add_week>0</add_week>
-	<last_week>40</last_week>
+	<last_week>36</last_week>
 	<week_gap>1</week_gap>
 	<property>national</property>
 	<property>omit_from_history</property>
diff --git a/support_files/definitions/south_america/argentina/cup_argentino_a_fase2.xml b/support_files/definitions/south_america/argentina/cup_argentino_a_fase2.xml
index dd30b56c..04a1bcab 100644
--- a/support_files/definitions/south_america/argentina/cup_argentino_a_fase2.xml
+++ b/support_files/definitions/south_america/argentina/cup_argentino_a_fase2.xml
@@ -4,8 +4,8 @@
 	<short_name>Argentino A</short_name>
 	<symbol>flag_argentina.png</symbol>
 	<sid>argentino_a_fase2</sid>
-	<add_week>41</add_week>
-	<last_week>46</last_week>
+	<add_week>37</add_week>
+	<last_week>43</last_week>
 	<week_gap>1</week_gap>
 	<property>national</property>
 	<property>omit_from_history</property>
diff --git a/support_files/definitions/south_america/argentina/cup_argentino_a_final.xml b/support_files/definitions/south_america/argentina/cup_argentino_a_final.xml
index d4a57b31..d3cf5a03 100644
--- a/support_files/definitions/south_america/argentina/cup_argentino_a_final.xml
+++ b/support_files/definitions/south_america/argentina/cup_argentino_a_final.xml
@@ -4,8 +4,8 @@
 	<short_name>Argentino A</short_name>
 	<symbol>flag_argentina.png</symbol>
 	<sid>argentino_a_final</sid>
-	<add_week>47</add_week>
-	<last_week>48</last_week>
+	<add_week>44</add_week>
+	<last_week>46</last_week>
 	<property>promotion</property>
 	<week_gap>1</week_gap>
 	<property>national</property>
diff --git a/support_files/definitions/south_america/argentina/cup_argentino_b_fase1.xml b/support_files/definitions/south_america/argentina/cup_argentino_b_fase1.xml
new file mode 100644
index 00000000..50e60860
--- /dev/null
+++ b/support_files/definitions/south_america/argentina/cup_argentino_b_fase1.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cup>
+	<name>Torneo Argentino B</name>
+	<short_name>Argentino B</short_name>
+	<symbol>flag_argentina.png</symbol>
+	<sid>argentino_b_fase1</sid>
+	<add_week>0</add_week>
+	<last_week>36</last_week>
+	<week_gap>1</week_gap>
+	<property>national</property>
+	<property>omit_from_history</property>
+	<cup_rounds>
+		<cup_round>
+			<number_of_groups>8</number_of_groups>
+			<number_of_advance>2</number_of_advance>
+			<round_robins>6</round_robins>
+			<choose_teams>
+				<choose_team>
+					<choose_team_sid>argentina4b</choose_team_sid>
+				</choose_team>
+			</choose_teams>
+		</cup_round>
+	</cup_rounds>
+</cup>
diff --git a/support_files/definitions/south_america/argentina/cup_argentino_b_fase2.xml b/support_files/definitions/south_america/argentina/cup_argentino_b_fase2.xml
new file mode 100644
index 00000000..3b40831e
--- /dev/null
+++ b/support_files/definitions/south_america/argentina/cup_argentino_b_fase2.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cup>
+	<name>Torneo Argentino B</name>
+	<short_name>Argentino B</short_name>
+	<symbol>flag_argentina.png</symbol>
+	<sid>argentino_b_fase2</sid>
+	<add_week>37</add_week>
+	<last_week>43</last_week>
+	<week_gap>1</week_gap>
+	<property>national</property>
+	<property>omit_from_history</property>
+	<property>highlight2</property>
+	<cup_rounds>
+		<cup_round>
+			<number_of_groups>4</number_of_groups>
+			<number_of_advance>1</number_of_advance>
+			<choose_teams>
+				<choose_team>
+					<choose_team_sid>argentino_b_fase1</choose_team_sid>
+					<number_of_teams>16</number_of_teams>
+					<start_idx>1</start_idx>
+					<end_idx>16</end_idx>
+				</choose_team>
+			</choose_teams>
+		</cup_round>
+	</cup_rounds>
+</cup>
diff --git a/support_files/definitions/south_america/argentina/cup_argentino_b_final.xml b/support_files/definitions/south_america/argentina/cup_argentino_b_final.xml
new file mode 100644
index 00000000..57877f68
--- /dev/null
+++ b/support_files/definitions/south_america/argentina/cup_argentino_b_final.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cup>
+	<name>Torneo Argentino B</name>
+	<short_name>Argentino B</short_name>
+	<symbol>flag_argentina.png</symbol>
+	<sid>argentino_b_final</sid>
+	<add_week>44</add_week>
+	<last_week>46</last_week>
+	<property>promotion</property>
+	<week_gap>1</week_gap>
+	<property>national</property>
+	<property>highlight2</property>
+	<cup_rounds>
+		<cup_round>
+			<round_name>Ascenso</round_name>
+			<choose_teams>
+				<choose_team>
+					<choose_team_sid>argentino_b_fase2</choose_team_sid>
+					<number_of_teams>4</number_of_teams>
+					<start_idx>1</start_idx>
+					<end_idx>4</end_idx>
+				</choose_team>
+			</choose_teams>
+		</cup_round>
+		<cup_round>
+		</cup_round>
+	</cup_rounds>
+</cup>
diff --git a/support_files/definitions/south_america/argentina/cup_reducido.xml b/support_files/definitions/south_america/argentina/cup_reducido.xml
index 4182ee4a..887581e5 100644
--- a/support_files/definitions/south_america/argentina/cup_reducido.xml
+++ b/support_files/definitions/south_america/argentina/cup_reducido.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cup>
-	<name>Torneo Reducido</name>
+	<name>Torneo Reducido (1ra B M)</name>
 	<short_name>Reducido</short_name>
 	<symbol>flag_argentina.png</symbol>
 	<sid>reducido</sid>
diff --git a/support_files/definitions/south_america/argentina/cup_reducido_1c.xml b/support_files/definitions/south_america/argentina/cup_reducido_1c.xml
new file mode 100644
index 00000000..0295306e
--- /dev/null
+++ b/support_files/definitions/south_america/argentina/cup_reducido_1c.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cup>
+	<name>Torneo Reducido (1ra C M)</name>
+	<short_name>Reducido 1C</short_name>
+	<symbol>flag_argentina.png</symbol>
+	<sid>reducido_1c</sid>
+	<add_week>44</add_week>
+	<last_week>48</last_week>
+	<week_gap>1</week_gap>
+	<property>national</property>
+	<property>promotion</property>
+	<property>highlight3</property>
+	<cup_rounds>
+		<cup_round>
+			<home_away>0</home_away>
+			<randomise_teams>0</randomise_teams>
+			<choose_teams>
+				<choose_team>
+					<choose_team_sid>argentina4a</choose_team_sid>
+					<number_of_teams>1</number_of_teams>
+					<start_idx>2</start_idx>
+					<end_idx>2</end_idx>
+				</choose_team>
+				<choose_team>
+					<choose_team_sid>argentina4a</choose_team_sid>
+					<number_of_teams>1</number_of_teams>
+					<start_idx>9</start_idx>
+					<end_idx>9</end_idx>
+				</choose_team>
+				<choose_team>
+					<choose_team_sid>argentina4a</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>argentina4a</choose_team_sid>
+					<number_of_teams>1</number_of_teams>
+					<start_idx>8</start_idx>
+					<end_idx>8</end_idx>
+				</choose_team>
+				<choose_team>
+					<choose_team_sid>argentina4a</choose_team_sid>
+					<number_of_teams>1</number_of_teams>
+					<start_idx>4</start_idx>
+					<end_idx>4</end_idx>
+				</choose_team>
+				<choose_team>
+					<choose_team_sid>argentina4a</choose_team_sid>
+					<number_of_teams>1</number_of_teams>
+					<start_idx>7</start_idx>
+					<end_idx>7</end_idx>
+				</choose_team>
+				<choose_team>
+					<choose_team_sid>argentina4a</choose_team_sid>
+					<number_of_teams>1</number_of_teams>
+					<start_idx>5</start_idx>
+					<end_idx>5</end_idx>
+				</choose_team>
+				<choose_team>
+					<choose_team_sid>argentina4a</choose_team_sid>
+					<number_of_teams>1</number_of_teams>
+					<start_idx>6</start_idx>
+					<end_idx>6</end_idx>
+				</choose_team>
+			</choose_teams>
+		</cup_round>
+		<cup_round>
+		</cup_round>
+		<cup_round>
+		</cup_round>
+	</cup_rounds>
+</cup>
diff --git a/support_files/definitions/south_america/argentina/league_argentina1.xml b/support_files/definitions/south_america/argentina/league_argentina1.xml
index 96311266..f9bd3d21 100644
--- a/support_files/definitions/south_america/argentina/league_argentina1.xml
+++ b/support_files/definitions/south_america/argentina/league_argentina1.xml
@@ -20,8 +20,8 @@
 			<prom_rel_type>relegation</prom_rel_type>
 		</prom_rel_element>
 	</prom_rel>
-	<new_table name="Apertura">1</new_table>
-	<new_table name="Clausura">27</new_table>
+	<new_table name="Apertura (1D)">1</new_table>
+	<new_table name="Clausura (1D)">27</new_table>
 	<teams>
 		<team>
 			<team_name>B. Juniors</team_name>
diff --git a/support_files/definitions/south_america/argentina/league_argentina3a.xml b/support_files/definitions/south_america/argentina/league_argentina3a.xml
index ed09748f..21e5a6c5 100644
--- a/support_files/definitions/south_america/argentina/league_argentina3a.xml
+++ b/support_files/definitions/south_america/argentina/league_argentina3a.xml
@@ -37,6 +37,12 @@
 			<prom_games_number_of_advance>1</prom_games_number_of_advance>
 			<prom_games_cup_sid>reducido</prom_games_cup_sid>
 		</prom_games>
+		<prom_rel_element>
+			<rank_start>20</rank_start>
+			<rank_end>21</rank_end>
+			<dest_sid>argentina4a</dest_sid>
+			<prom_rel_type>relegation</prom_rel_type>
+		</prom_rel_element>
 	</prom_rel>
 	<teams>
 		<team>
diff --git a/support_files/definitions/south_america/argentina/league_argentina3b.xml b/support_files/definitions/south_america/argentina/league_argentina3b.xml
index 5e9d838d..92982a73 100644
--- a/support_files/definitions/south_america/argentina/league_argentina3b.xml
+++ b/support_files/definitions/south_america/argentina/league_argentina3b.xml
@@ -9,6 +9,14 @@
 	<names_file>argentina</names_file>
 	<property>inactive</property>
 	<property>omit_from_history</property>
+	<prom_rel>
+		<prom_games>
+			<prom_games_dest_sid>argentina3b</prom_games_dest_sid>
+			<prom_games_loser_sid>argentina4b</prom_games_loser_sid>
+			<prom_games_number_of_advance>2</prom_games_number_of_advance>
+			<prom_games_cup_sid>argentino_a_descenso</prom_games_cup_sid>
+		</prom_games>
+	</prom_rel>
 	<teams>
 		<team>
 			<team_name>Alvarado</team_name>
@@ -128,10 +136,9 @@
 			<team_name>Racing C.</team_name>
 			<team_average_talent>6300</team_average_talent>
 		</team>
-
-		<team>
+<!--		<team>
 			<team_name>T. Perico</team_name>
 			<team_average_talent>6300</team_average_talent>
-		</team>
+		</team>-->
 	</teams>
 </league>
diff --git a/support_files/definitions/south_america/argentina/league_argentina4a.xml b/support_files/definitions/south_america/argentina/league_argentina4a.xml
new file mode 100644
index 00000000..a44b550c
--- /dev/null
+++ b/support_files/definitions/south_america/argentina/league_argentina4a.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<league>
+	<sid>argentina4a</sid>
+	<layer>4</layer>	
+	<name>Primera C Metropolitana</name>
+	<short_name>Primera C Metropolitana</short_name>
+	<symbol>flag_argentina.png</symbol>
+	<average_talent>5800</average_talent>
+	<names_file>argentina</names_file>	
+	<first_week>6</first_week>
+	<week_gap>1</week_gap>
+	<yellow_red>5</yellow_red>
+	<round_robins>2</round_robins>
+	<prom_rel>
+		<prom_rel_element>
+			<rank_start>1</rank_start>
+			<rank_end>1</rank_end>
+			<dest_sid>argentina3a</dest_sid>
+			<prom_rel_type>promotion</prom_rel_type>
+		</prom_rel_element>
+		<prom_games>
+			<prom_games_dest_sid>argentina3a</prom_games_dest_sid>
+			<prom_games_loser_sid>argentina4a</prom_games_loser_sid>
+			<prom_games_number_of_advance>1</prom_games_number_of_advance>
+			<prom_games_cup_sid>reducido_1c</prom_games_cup_sid>
+		</prom_games>
+	</prom_rel>
+	<teams>
+		<team>
+			<team_name>A. A. Rosario</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>A. A. Merlo</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>Barracas C.</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>Cañuelas</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>Colegiales V. L.</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>Laferrere</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>Dock Sud</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>Porvenir Avellaneda</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>Excursionistas</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>Fenix</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>Lamadrid</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>J. J. Urquiza</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>L. N. Alem</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>C. Luján</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>Sacachispas</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>S. M. A. Brown</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>San Miguel</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>Barracas</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>Dálmine</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>V. S. Carlos</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+
+	</teams>
+</league>
diff --git a/support_files/definitions/south_america/argentina/league_argentina4b.xml b/support_files/definitions/south_america/argentina/league_argentina4b.xml
new file mode 100644
index 00000000..7d5986e6
--- /dev/null
+++ b/support_files/definitions/south_america/argentina/league_argentina4b.xml
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<league>
+	<sid>argentina4b</sid>
+	<layer>4</layer>	
+	<name>Torneo Argentino B</name>
+	<short_name>Argentino B</short_name>
+	<symbol>flag_argentina.png</symbol>
+	<average_talent>5800</average_talent>
+	<names_file>argentina</names_file>
+	<property>inactive</property>
+	<property>omit_from_history</property>
+	<prom_rel>
+		<prom_games>
+			<prom_games_dest_sid>argentina3b</prom_games_dest_sid>
+			<prom_games_loser_sid>argentina4b</prom_games_loser_sid>
+			<prom_games_number_of_advance>2</prom_games_number_of_advance>
+			<prom_games_cup_sid>argentino_b_final</prom_games_cup_sid>
+		</prom_games>
+	</prom_rel>
+	<teams>
+		<team>
+			<team_name>G. Paz</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>A. Policial</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>C. C. S. Estero</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>Concepción</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>Nuñorco</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>A. Famaillá</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>C. Norte</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>GyT Salta</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>S. A. Formosa</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>Chaco F. E.</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>T. Mandiyú</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>A. Patronato</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>Juventud U.</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>C. Concordia</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>Crucero N.</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>A. Franco</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>E. R. Cuarto</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>Atenas</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>S. M. Mendoza</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>D. Guaymallén</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>D. M. Mendoza</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>A. A. Guaymallén</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>Trinidad</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>J. Alianza</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>Douglas H.</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>D. Belgrano</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>L. Emilia</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>GyE Santa Fe</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>9J Morteros</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>T. Federal</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>S. Belgrano</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>9J Rio Tercero</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>Alvarado</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>Sporting</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>G. Universitario</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>R. Olavarría</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>D. Coreano</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>T. Algarrobos</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>Lincoln</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>D. Salto</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>R. Trelew</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>D. Madryn</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>Cruz del Sur</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>I. Neuquén</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>A. Maronese</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>D. Roca</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>B. Vista</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+		<team>
+			<team_name>Liniers</team_name>
+			<team_average_talent>5800</team_average_talent>
+		</team>
+	</teams>
+</league>
diff --git a/support_files/definitions/south_america/bolivia/cup_clausura_final.xml b/support_files/definitions/south_america/bolivia/cup_clausura_final.xml
index 4cd51167..d7a6ba07 100755
--- a/support_files/definitions/south_america/bolivia/cup_clausura_final.xml
+++ b/support_files/definitions/south_america/bolivia/cup_clausura_final.xml
@@ -42,4 +42,4 @@
 		<cup_round>
 		</cup_round>
 	</cup_rounds>
-</cup>
\ No newline at end of file
+</cup>
diff --git a/support_files/definitions/south_america/bolivia/cup_clausura_grupo_a.xml b/support_files/definitions/south_america/bolivia/cup_clausura_grupo_a.xml
index 07064042..380b7eef 100755
--- a/support_files/definitions/south_america/bolivia/cup_clausura_grupo_a.xml
+++ b/support_files/definitions/south_america/bolivia/cup_clausura_grupo_a.xml
@@ -4,8 +4,8 @@
 	<short_name>Clausura A</short_name>
 	<symbol>flag_bolivia.png</symbol>
 	<sid>clausura_grupo_a</sid>
-	<add_week>27</add_week>
-	<last_week>41</last_week>
+	<add_week>29</add_week>
+	<last_week>40</last_week>
 	<week_gap>1</week_gap>
 	<property>national</property>
 	<property>omit_from_history</property>
@@ -53,4 +53,4 @@
 			</choose_teams>
 		</cup_round>
 	</cup_rounds>
-</cup>
\ No newline at end of file
+</cup>
diff --git a/support_files/definitions/south_america/bolivia/cup_clausura_grupo_b.xml b/support_files/definitions/south_america/bolivia/cup_clausura_grupo_b.xml
index 7ae29090..66d411ac 100755
--- a/support_files/definitions/south_america/bolivia/cup_clausura_grupo_b.xml
+++ b/support_files/definitions/south_america/bolivia/cup_clausura_grupo_b.xml
@@ -4,8 +4,8 @@
 	<short_name>Clausura B</short_name>
 	<symbol>flag_bolivia.png</symbol>
 	<sid>clausura_grupo_b</sid>
-	<add_week>27</add_week>
-	<last_week>41</last_week>
+	<add_week>29</add_week>
+	<last_week>40</last_week>
 	<week_gap>1</week_gap>
 	<property>national</property>
 	<property>omit_from_history</property>
@@ -53,4 +53,4 @@
 			</choose_teams>
 		</cup_round>
 	</cup_rounds>
-</cup>
\ No newline at end of file
+</cup>
diff --git a/support_files/definitions/south_america/bolivia/league_bolivia1.xml b/support_files/definitions/south_america/bolivia/league_bolivia1.xml
index 573a853c..803f82f5 100644
--- a/support_files/definitions/south_america/bolivia/league_bolivia1.xml
+++ b/support_files/definitions/south_america/bolivia/league_bolivia1.xml
@@ -9,13 +9,6 @@
 	<names_file>latinoamerica</names_file>	
 	<first_week>7</first_week>
 	<week_gap>1</week_gap>
-
-		<two_match_week_start>3</two_match_week_start>
-		<two_match_week_end>4</two_match_week_end>
-
-		<two_match_week_start>15</two_match_week_start>
-		<two_match_week_end>16</two_match_week_end>
-
 	<yellow_red>5</yellow_red>
 	<round_robins>2</round_robins>
 	<teams>
diff --git a/support_files/definitions/south_america/chile/league_chile1.xml b/support_files/definitions/south_america/chile/league_chile1.xml
index 5fa5320e..8457fd1d 100644
--- a/support_files/definitions/south_america/chile/league_chile1.xml
+++ b/support_files/definitions/south_america/chile/league_chile1.xml
@@ -12,8 +12,8 @@
 	<yellow_red>5</yellow_red>
 	<round_robins>2</round_robins>
 	<break>3</break>
-	<new_table name="Apertura">1</new_table>
-	<new_table name="Clausura">27</new_table>
+	<new_table name="Apertura (1)">1</new_table>
+	<new_table name="Clausura (1)">27</new_table>
 	<prom_rel>
 		<prom_rel_element>
 			<rank_start>19</rank_start>
diff --git a/support_files/definitions/south_america/chile/league_chile2.xml b/support_files/definitions/south_america/chile/league_chile2.xml
index d83dc43b..63b4e1c7 100644
--- a/support_files/definitions/south_america/chile/league_chile2.xml
+++ b/support_files/definitions/south_america/chile/league_chile2.xml
@@ -25,8 +25,8 @@
 	<yellow_red>5</yellow_red>
 	<round_robins>4</round_robins>
 	<break>1</break>
-	<new_table name="Apertura">1</new_table>
-	<new_table name="Clausura">27</new_table>
+	<new_table name="Apertura (1B)">1</new_table>
+	<new_table name="Clausura (1B)">27</new_table>
 	<prom_rel>
 		<prom_rel_element>
 			<rank_start>1</rank_start>
diff --git a/support_files/definitions/south_america/colombia/country_colombia.xml b/support_files/definitions/south_america/colombia/country_colombia.xml
index 5b39fa59..2ee81cbb 100644
--- a/support_files/definitions/south_america/colombia/country_colombia.xml
+++ b/support_files/definitions/south_america/colombia/country_colombia.xml
@@ -9,10 +9,6 @@
 		<league>colombia2</league>
 	</leagues>
 	<cups>
-		<cup>libertadores</cup>
-		<cup>sudamericana</cup>
-		<cup>recopa</cup>
-		<cup>mundial_clubes</cup>
 		<cup>mustang1a</cup>
 		<cup>mustang1b</cup>
 		<cup>mustang1</cup>
@@ -23,5 +19,9 @@
 		<cup>copa_premier_fase2</cup>
 		<cup>copa_premier_final</cup>
 		<cup>copa_colombia</cup>
+		<cup>libertadores</cup>
+		<cup>sudamericana</cup>
+		<cup>recopa</cup>
+		<cup>mundial_clubes</cup>
 	</cups>
 </country>
diff --git a/support_files/definitions/south_america/colombia/cup_mustang1.xml b/support_files/definitions/south_america/colombia/cup_mustang1.xml
index 9c266831..97d36201 100755
--- a/support_files/definitions/south_america/colombia/cup_mustang1.xml
+++ b/support_files/definitions/south_america/colombia/cup_mustang1.xml
@@ -27,4 +27,4 @@
 			</choose_teams>
 		</cup_round>
 	</cup_rounds>
-</cup>
\ No newline at end of file
+</cup>
diff --git a/support_files/definitions/south_america/colombia/cup_mustang1a.xml b/support_files/definitions/south_america/colombia/cup_mustang1a.xml
index 4a9e7e78..ade0eb78 100755
--- a/support_files/definitions/south_america/colombia/cup_mustang1a.xml
+++ b/support_files/definitions/south_america/colombia/cup_mustang1a.xml
@@ -46,4 +46,4 @@
 			</choose_teams>
 		</cup_round>
 	</cup_rounds>
-</cup>
\ No newline at end of file
+</cup>
diff --git a/support_files/definitions/south_america/colombia/cup_mustang1b.xml b/support_files/definitions/south_america/colombia/cup_mustang1b.xml
index a8823dec..e78f801a 100755
--- a/support_files/definitions/south_america/colombia/cup_mustang1b.xml
+++ b/support_files/definitions/south_america/colombia/cup_mustang1b.xml
@@ -46,4 +46,4 @@
 			</choose_teams>
 		</cup_round>
 	</cup_rounds>
-</cup>
\ No newline at end of file
+</cup>
diff --git a/support_files/definitions/south_america/colombia/cup_mustang2.xml b/support_files/definitions/south_america/colombia/cup_mustang2.xml
index 33a70313..4dca4850 100755
--- a/support_files/definitions/south_america/colombia/cup_mustang2.xml
+++ b/support_files/definitions/south_america/colombia/cup_mustang2.xml
@@ -27,4 +27,4 @@
 			</choose_teams>
 		</cup_round>
 	</cup_rounds>
-</cup>
\ No newline at end of file
+</cup>
diff --git a/support_files/definitions/south_america/colombia/league_colombia1.xml b/support_files/definitions/south_america/colombia/league_colombia1.xml
index 2d750920..a9be4070 100644
--- a/support_files/definitions/south_america/colombia/league_colombia1.xml
+++ b/support_files/definitions/south_america/colombia/league_colombia1.xml
@@ -39,8 +39,8 @@
                         <prom_rel_type>relegation</prom_rel_type>
                 </prom_rel_element>
         </prom_rel>
-	<new_table name="Apertura">1</new_table>
-	<new_table name="Finalización">27</new_table>
+	<new_table name="Apertura (1D)">1</new_table>
+	<new_table name="Finalización (1D)">27</new_table>
 	<teams>
  		<team>
  			<team_name>Nacional</team_name>
diff --git a/support_files/definitions/south_america/ecuador/cup_ecuador_serie_a_tres.xml b/support_files/definitions/south_america/ecuador/cup_ecuador_serie_a_tres.xml
index 5a1e4d61..4f4e9126 100644
--- a/support_files/definitions/south_america/ecuador/cup_ecuador_serie_a_tres.xml
+++ b/support_files/definitions/south_america/ecuador/cup_ecuador_serie_a_tres.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cup>
 	<name>Serie A: Final</name>
-	<short_name>Serie A 3ra</short_name>
+	<short_name>Serie A Final</short_name>
 	<symbol>flag_ecuador.png</symbol>
 	<sid>ecuador_serie_a_tres</sid>
-	<add_week>38</add_week>
-	<last_week>48</last_week>
+	<add_week>37</add_week>
+	<last_week>46</last_week>
 	<week_gap>1</week_gap>
 	<property>national</property>
 	<property>highlight1</property>
diff --git a/support_files/definitions/south_america/ecuador/cup_ecuador_seriea_dos_a.xml b/support_files/definitions/south_america/ecuador/cup_ecuador_seriea_dos_a.xml
deleted file mode 100644
index 999bf475..00000000
--- a/support_files/definitions/south_america/ecuador/cup_ecuador_seriea_dos_a.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cup>
-	<name>Serie A, 2da Etapa: Grupo B</name>
-	<short_name>Clausura B</short_name>
-	<symbol>flag_ecuador.png</symbol>
-	<sid>ecuador_serie_a_dos_b</sid>
-	<add_week>25</add_week>
-	<last_week>35</last_week>
-	<week_gap>1</week_gap>
-	<property>national</property>
-	<property>omit_from_history</property>
-	<cup_rounds>
-		<cup_round>
-			<number_of_groups>1</number_of_groups>
-			<randomise_teams>0</randomise_teams>
-			<choose_teams>
-				<choose_team>
-					<choose_team_sid>ecuador1</choose_team_sid>
-					<number_of_teams>1</number_of_teams>
-					<start_idx>2</start_idx>
-					<end_idx>2</end_idx>
-				</choose_team>
-				<choose_team>
-					<choose_team_sid>ecuador1</choose_team_sid>
-					<number_of_teams>1</number_of_teams>
-					<start_idx>4</start_idx>
-					<end_idx>4</end_idx>
-				</choose_team>
-				<choose_team>
-					<choose_team_sid>ecuador1</choose_team_sid>
-					<number_of_teams>1</number_of_teams>
-					<start_idx>6</start_idx>
-					<end_idx>6</end_idx>
-				</choose_team>
-				<choose_team>
-					<choose_team_sid>ecuador1</choose_team_sid>
-					<number_of_teams>1</number_of_teams>
-					<start_idx>8</start_idx>
-					<end_idx>8</end_idx>
-				</choose_team>
-				<choose_team>
-					<choose_team_sid>ecuador1</choose_team_sid>
-					<number_of_teams>1</number_of_teams>
-					<start_idx>10</start_idx>
-					<end_idx>10</end_idx>
-				</choose_team>
-				<choose_team>
-					<choose_team_sid>ecuador1</choose_team_sid>
-					<number_of_teams>1</number_of_teams>
-					<start_idx>12</start_idx>
-					<end_idx>12</end_idx>
-				</choose_team>
-			</choose_teams>
-		</cup_round>
-	</cup_rounds>
-</cup>
diff --git a/support_files/definitions/south_america/peru/league_peru1.xml b/support_files/definitions/south_america/peru/league_peru1.xml
index 578f3d5d..6eec67cf 100644
--- a/support_files/definitions/south_america/peru/league_peru1.xml
+++ b/support_files/definitions/south_america/peru/league_peru1.xml
@@ -49,8 +49,8 @@
 	<yellow_red>5</yellow_red>
 	<round_robins>4</round_robins>
 	<break>1</break>
-	<new_table name="Apertura">1</new_table>
-	<new_table name="Clausura">27</new_table>
+	<new_table name="Apertura (1D)">1</new_table>
+	<new_table name="Clausura (1D)">27</new_table>
 	<prom_rel>
 		<prom_rel_element>
 			<rank_start>13</rank_start>