diff --git a/support_files/definitions/japan/country_japan.xml b/support_files/definitions/japan/country_japan.xml
index 50fca3c4..aa77b892 100644
--- a/support_files/definitions/japan/country_japan.xml
+++ b/support_files/definitions/japan/country_japan.xml
@@ -32,7 +32,7 @@
 	<cups>
 		<cup>japan_emperor</cup>
 		<cup>japan_nabisco</cup>
-		<cup>supercup_league_vs_cup</cup>
+		<cup>japan_supercup</cup>
 		<cup>japan_prom2</cup>
 		<cup>japan_prom4</cup>
 		<cup>japan_prom5-4</cup>
diff --git a/support_files/definitions/japan/cup_japan_emperor.xml b/support_files/definitions/japan/cup_japan_emperor.xml
index 93d6bae3..1bbf4e12 100644
--- a/support_files/definitions/japan/cup_japan_emperor.xml
+++ b/support_files/definitions/japan/cup_japan_emperor.xml
@@ -5,14 +5,13 @@
 	<symbol>flag_japan.png</symbol>
 	<sid>japan_emperor</sid>
 	<add_week>-1</add_week>
-	<week_gap>5</week_gap>
+	<week_gap>2</week_gap>
 	<last_week>41</last_week>
 	<property>national</property>
 	<property>weak_at_home</property>
 	
 	<cup_rounds>
 		<cup_round>
-			<byes>19</byes>
 			<home_away>0</home_away>
 			<choose_teams>
 				<choose_team>
@@ -45,65 +44,54 @@
 				<choose_team>
 					<choose_team_sid>japan5-7</choose_team_sid>
 				</choose_team>
-			</choose_teams>
-		</cup_round>
-		<cup_round>
-			<byes>0</byes>
-			<home_away>0</home_away>
-			<choose_teams>	<!--46 + 12 (58)-->
+				
 				<choose_team>
-					<choose_team_sid>japan3</choose_team_sid>
-					<number_of_teams>12</number_of_teams>
-					<start_idx>7</start_idx>
-					<end_idx>18</end_idx>
+					<choose_team_sid>japan4-1</choose_team_sid>
 				</choose_team>
-			</choose_teams>
-		</cup_round>
-		<cup_round>
-			<byes>0</byes>
-			<home_away>0</home_away>
-			<choose_teams>	<!--29 + 6 + 1 (36)-->
+				<choose_team>
+					<choose_team_sid>japan4-2</choose_team_sid>
+				</choose_team>
+				<choose_team>
+					<choose_team_sid>japan4-3</choose_team_sid>
+				</choose_team>
+				<choose_team>
+					<choose_team_sid>japan4-4</choose_team_sid>
+				</choose_team>
+				<choose_team>
+					<choose_team_sid>japan4-5</choose_team_sid>
+				</choose_team>
+				<choose_team>
+					<choose_team_sid>japan4-6</choose_team_sid>
+				</choose_team>
+				<choose_team>
+					<choose_team_sid>japan4-7</choose_team_sid>
+				</choose_team>
+				<choose_team>
+					<choose_team_sid>japan4-8</choose_team_sid>
+				</choose_team>
+				<choose_team>
+					<choose_team_sid>japan4-9</choose_team_sid>
+				</choose_team>
+				
 				<choose_team>
 					<choose_team_sid>japan3</choose_team_sid>
-					<number_of_teams>6</number_of_teams>
-					<start_idx>1</start_idx>
-					<end_idx>6</end_idx>
 				</choose_team>
 				<choose_team>
 					<choose_team_sid>japan2</choose_team_sid>
-					<number_of_teams>1</number_of_teams>
-					<start_idx>13</start_idx>
-					<end_idx>13</end_idx>
+				</choose_team>
+				<choose_team>
+					<choose_team_sid>japan1</choose_team_sid>
 				</choose_team>
 			</choose_teams>
 		</cup_round>
 		<cup_round>
 			<home_away>0</home_away>
-			<choose_teams>	<!--18 + 12 + 2 (32)-->
-				<choose_team>
-					<choose_team_sid>japan2</choose_team_sid>
-					<number_of_teams>12</number_of_teams>
-					<start_idx>1</start_idx>
-					<end_idx>12</end_idx>
-				</choose_team>
-				<choose_team>
-					<choose_team_sid>japan1</choose_team_sid>
-					<number_of_teams>2</number_of_teams>
-					<start_idx>17</start_idx>
-					<end_idx>18</end_idx>
-				</choose_team>
-			</choose_teams>
 		</cup_round>
 		<cup_round>
 			<home_away>0</home_away>
-			<choose_teams>	<!--16 + 16 (32)-->
-				<choose_team>
-					<choose_team_sid>japan1</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_round>
+			<home_away>0</home_away>
 		</cup_round>
 		<cup_round>
 			<home_away>0</home_away>
diff --git a/support_files/definitions/japan/cup_japan_nabisco.xml b/support_files/definitions/japan/cup_japan_nabisco.xml
index 709112c2..b46e4d57 100644
--- a/support_files/definitions/japan/cup_japan_nabisco.xml
+++ b/support_files/definitions/japan/cup_japan_nabisco.xml
@@ -4,50 +4,37 @@
 	<short_name>L. Cup</short_name>
 	<symbol>flag_japan.png</symbol>
 	<sid>japan_nabisco</sid>
-	<last_week>14</last_week>
-	<week_gap>1</week_gap>
+	<last_week>25</last_week>
+	<week_gap>2</week_gap>
 	<property>national</property>
 	
 	<cup_rounds>
 		<cup_round>
 			<choose_teams>
+				<number_of_groups>5</number_of_groups>
+				<number_of_advance>1</number_of_advance>
+				<number_of_best_advance>3</number_of_best_advance>
 				<choose_team>
 					<choose_team_sid>japan1</choose_team_sid>
-					<number_of_teams>2</number_of_teams>
-					<start_idx>17</start_idx>
+					<number_of_teams>18</number_of_teams>
+					<start_idx>1</start_idx>
 					<end_idx>18</end_idx>
 				</choose_team>
-			</choose_teams>
-		</cup_round>
-		<cup_round>
-			<number_of_groups>4</number_of_groups>
-			<number_of_advance>1</number_of_advance>
-			<number_of_best_advance>3</number_of_best_advance>
-			<choose_teams>
 				<choose_team>
-					<choose_team_sid>japan1</choose_team_sid>
-					<number_of_teams>15</number_of_teams>
-					<start_idx>2</start_idx>
-					<end_idx>16</end_idx>
-				</choose_team>
-			</choose_teams>
-		</cup_round>
-		<cup_round>
-			<choose_teams>
-				<choose_team>
-					<choose_team_sid>japan1</choose_team_sid>
-					<number_of_teams>1</number_of_teams>
+					<choose_team_sid>japan2</choose_team_sid>
+					<number_of_teams>2</number_of_teams>
 					<start_idx>1</start_idx>
-					<end_idx>1</end_idx>
+					<end_idx>2</end_idx>
 				</choose_team>
 			</choose_teams>
 		</cup_round>
 		<cup_round>
 		</cup_round>
+		<cup_round>
+		</cup_round>
 		<cup_round>
 			<home_away>0</home_away>
 			<neutral>1</neutral>
 		</cup_round>
 	</cup_rounds>
 </cup>
-				
\ No newline at end of file
diff --git a/support_files/definitions/japan/cup_japan_supercup.xml b/support_files/definitions/japan/cup_japan_supercup.xml
new file mode 100644
index 00000000..1963fa9a
--- /dev/null
+++ b/support_files/definitions/japan/cup_japan_supercup.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>	
+<cup>
+  <name>National Supercup</name>
+  <short_name>Nat. Supercup</short_name>
+  <sid>japan_supercup</sid>
+  <add_week>43</add_week>
+  <last_week>51</last_week>
+  <group>137</group>
+  <property>national</property>
+
+
+  <cup_rounds>
+    <cup_round>
+      <home_away>0</home_away>
+      <neutral>1</neutral>
+
+      <choose_teams>
+	
+	<choose_team>
+	  <choose_team_sid>CUP1</choose_team_sid>
+	  <number_of_teams>1</number_of_teams>
+	  <start_idx>1</start_idx>
+	  <end_idx>1</end_idx>
+	</choose_team>
+
+	<choose_team>
+	  <choose_team_sid>LEAGUE1</choose_team_sid>
+	  <number_of_teams>1</number_of_teams>
+	  <start_idx>1</start_idx>
+	  <end_idx>2</end_idx>
+	</choose_team>
+
+      </choose_teams>
+
+    </cup_round>
+  </cup_rounds>
+
+</cup>
diff --git a/support_files/definitions/japan/league_japan1.xml b/support_files/definitions/japan/league_japan1.xml
index 499e42ac..e8fbc79d 100644
--- a/support_files/definitions/japan/league_japan1.xml
+++ b/support_files/definitions/japan/league_japan1.xml
@@ -6,6 +6,15 @@
 	<symbol>flag_japan.png</symbol>
 	<first_week>1</first_week>
 	<week_gap>1</week_gap>
+	<break>4</break>
+	<two_match_week_start>8</two_match_week_start>
+	<two_match_week_end>9</two_match_week_end>
+	<two_match_week_start>15</two_match_week_start>
+	<two_match_week_end>16</two_match_week_end>
+	<two_match_week_start>19</two_match_week_start>
+	<two_match_week_end>20</two_match_week_end>
+	<two_match_week_start>22</two_match_week_start>
+	<two_match_week_end>23</two_match_week_end>
 	<average_talent>7800</average_talent>
 	<yellow_red>3</yellow_red>
 	<names_file>japan</names_file>
@@ -27,59 +36,59 @@
 	</prom_rel>
 	
 	<teams>
-		<team>
-			<team_name>G. Osaka</team_name>
-		</team>
 		<team>
 			<team_name>Urawa</team_name>
 		</team>
-		<team>
-			<team_name>Kashima</team_name>
-		</team>
-		<team>
-			<team_name>J.U. Ichihara</team_name>
-		</team>
-		<team>
-			<team_name>C. Osaka</team_name>
-		</team>
-		<team>
-			<team_name>J. Iwata</team_name>
-		</team>
-		<team>
-			<team_name>Hiroshima</team_name>
-		</team>
 		<team>
 			<team_name>Kawasaki</team_name>
 		</team>
 		<team>
-			<team_name>Yokohama F. M.</team_name>
-		</team>
-		<team>
-			<team_name>Tokyo</team_name>
-		</team>
-		<team>
-			<team_name>Oita</team_name>
-		</team>
-		<team>
-			<team_name>Niigata</team_name>
-		</team>
-		<team>
-			<team_name>Omiya</team_name>
-		</team>
-		<team>
-			<team_name>Nagoya G.E.</team_name>
+			<team_name>G. Osaka</team_name>
 		</team>
 		<team>
 			<team_name>Shimizu</team_name>
 		</team>
 		<team>
-			<team_name>Kyoto P.S.</team_name>
+			<team_name>J. Iwata</team_name>
 		</team>
 		<team>
-			<team_name>Fukuoka</team_name>
+			<team_name>Kashima</team_name>
+		</team>
+		<team>
+			<team_name>Nagoya G.E.</team_name>
+		</team>
+		<team>
+			<team_name>Oita</team_name>
+		</team>
+		<team>
+			<team_name>Yokohama F.M.</team_name>
+		</team>
+		<team>
+			<team_name>Hiroshima</team_name>
+		</team>
+		<team>
+			<team_name>J.U. Ichihara Chiba</team_name>
+		</team>
+		<team>
+			<team_name>Omiya</team_name>
+		</team>
+		<team>
+			<team_name>Tokyo</team_name>
+		</team>
+		<team>
+			<team_name>Niigata</team_name>
 		</team>
 		<team>
 			<team_name>Kofu</team_name>
 		</team>
+		<team>
+			<team_name>Yokohama F.C.</team_name>
+		</team>
+		<team>
+			<team_name>Kashiwa</team_name>
+		</team>
+		<team>
+			<team_name>Kobe</team_name>
+		</team>
 	</teams>
 </league>
\ No newline at end of file
diff --git a/support_files/definitions/japan/league_japan2.xml b/support_files/definitions/japan/league_japan2.xml
index 539d734d..ae074eed 100644
--- a/support_files/definitions/japan/league_japan2.xml
+++ b/support_files/definitions/japan/league_japan2.xml
@@ -6,9 +6,33 @@
 	<symbol>flag_japan.png</symbol>
 	<first_week>1</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>7</two_match_week_start>
+	<two_match_week_end>8</two_match_week_end>
+	<two_match_week_start>10</two_match_week_start>
+	<two_match_week_end>14</two_match_week_end>
+	<two_match_week_start>16</two_match_week_start>
+	<two_match_week_end>17</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>
+	<two_match_week_start>26</two_match_week_start>
+	<two_match_week_end>27</two_match_week_end>
+	<two_match_week_start>29</two_match_week_start>
+	<two_match_week_end>30</two_match_week_end>
+	<two_match_week_start>33</two_match_week_start>
+	<two_match_week_end>34</two_match_week_end>
+	<two_match_week_start>36</two_match_week_start>
+	<two_match_week_end>37</two_match_week_end>
+	<two_match_week_start>41</two_match_week_start>
+	<two_match_week_end>42</two_match_week_end>
+	<two_match_week_start>44</two_match_week_start>
+	<two_match_week_end>48</two_match_week_end>
 	<average_talent>7000</average_talent>
 	<names_file>japan</names_file>
-	<round_robins>3</round_robins>
+	<round_robins>4</round_robins>
 	<layer>2</layer>
 	
 	<prom_rel>
@@ -28,43 +52,43 @@
 	
 	<teams>
 		<team>
-			<team_name>Kashiwa</team_name>
+			<team_name>Fukuoka</team_name>
 		</team>
 		<team>
-			<team_name>Tokyo V.</team_name>
+			<team_name>C. Osaka</team_name>
 		</team>
 		<team>
-			<team_name>Kobe</team_name>
-		</team>
-		<team>
-			<team_name>Sendai</team_name>
-		</team>
-		<team>
-			<team_name>Yamagata</team_name>
-		</team>
-		<team>
-			<team_name>C. Sapporo</team_name>
-		</team>
-		<team>
-			<team_name>Hiratsuka S. B.</team_name>
+			<team_name>Kyoto S.</team_name>
 		</team>
 		<team>
 			<team_name>Tosu</team_name>
 		</team>
 		<team>
-			<team_name>Tokushima</team_name>
+			<team_name>Sendai</team_name>
+		</team>
+		<team>
+			<team_name>C. Sapporo</team_name>
+		</team>
+		<team>
+			<team_name>Tokyo V.</team_name>
+		</team>
+		<team>
+			<team_name>Yamagata</team_name>
+		</team>
+		<team>
+			<team_name>Ehime</team_name>
 		</team>
 		<team>
 			<team_name>Mito</team_name>
 		</team>
 		<team>
-			<team_name>Yokohama</team_name>
+			<team_name>Hiratsuka S.B.</team_name>
 		</team>
 		<team>
 			<team_name>Kusatsu</team_name>
 		</team>
 		<team>
-			<team_name>Ehime</team_name>
+			<team_name>Tokushima</team_name>
 		</team>
 	</teams>
 </league>
\ No newline at end of file
diff --git a/support_files/definitions/japan/league_japan3.xml b/support_files/definitions/japan/league_japan3.xml
index bad686ef..f4424540 100644
--- a/support_files/definitions/japan/league_japan3.xml
+++ b/support_files/definitions/japan/league_japan3.xml
@@ -28,58 +28,59 @@
 	
 	<teams>
 		<team>
-			<team_name>Y.K.K. A.P.</team_name>
+			<team_name>Hamamatsu H.F.C.</team_name>
 		</team>
 		<team>
-			<team_name>A. Hokuriku</team_name>
+			<team_name>S.E. Shiga</team_name>
+		</team>
+		<team>
+			<team_name>Y. Kurobe</team_name>
+		</team>
+		<team>
+			<team_name>R. Kumamoto</team_name>
+		</team>
+		<team>
+			<team_name>Y. Musashino</team_name>
 		</team>
 		<team>
 			<team_name>Tochigi</team_name>
 		</team>
 		<team>
-			<team_name>H. Sayama</team_name>
+			<team_name>Toyama A.H.</team_name>
 		</team>
 		<team>
-			<team_name>S.E. Tokyo</team_name>
+			<team_name>S.S. Tagajo</team_name>
 		</team>
 		<team>
-			<team_name>S. Sendai</team_name>
+			<team_name>A. Takasaki</team_name>
 		</team>
 		<team>
-			<team_name>Horikoshi</team_name>
+			<team_name>G. Tottori</team_name>
 		</team>
 		<team>
-			<team_name>Yokogawa</team_name>
+			<team_name>J.U. Ichihara Chiba C.</team_name>
 		</team>
 		<team>
-			<team_name>S.E. Osaka</team_name>
+			<team_name>Kariya</team_name>
 		</team>
 		<team>
-			<team_name>S.P. S.C.</team_name>
+			<team_name>F.C.R. Okinawa</team_name>
 		</team>
 		<team>
-			<team_name>S.C. T.</team_name>
+			<team_name>S.P. Muko</team_name>
 		</team>
 		<team>
-			<team_name>Ryutsu Keizai</team_name>
+			<team_name>R.K.U. Ryugasaki</team_name>
 		</team>
 		<team>
-			<team_name>D. Kariya</team_name>
+			<team_name>M.M. Mizushima</team_name>
 		</team>
 		<team>
-			<team_name>H.L. Miyazaki</team_name>
+			<team_name>Gifu</team_name>
 		</team>
 		<team>
-			<team_name>M.M. Mizuishima</team_name>
-		</team>
-		<team>
-			<team_name>Ryu. Okinawa</team_name>
-		</team>
-		<team>
-			<team_name>J.U. Chiba</team_name>
-		</team>
-		<team>
-			<team_name>R. Kumamoto</team_name>
+			<team_name>T. Nikaho</team_name>
 		</team>
+
 	</teams>
 </league>
\ No newline at end of file
diff --git a/support_files/definitions/japan/league_japan4-1.xml b/support_files/definitions/japan/league_japan4-1.xml
index 123f07a6..ad0dd13d 100644
--- a/support_files/definitions/japan/league_japan4-1.xml
+++ b/support_files/definitions/japan/league_japan4-1.xml
@@ -26,10 +26,10 @@
 			<team_name>B. Kobe</team_name>
 		</team>
 		<team>
-			<team_name>Kobe</team_name>
+			<team_name>M.B. Kusatsu</team_name>
 		</team>
 		<team>
-			<team_name>A.I.N.</team_name>
+			<team_name>Kobe</team_name>
 		</team>
 		<team>
 			<team_name>S. Sumoto</team_name>
@@ -38,13 +38,13 @@
 			<team_name>A.S. L. Kyoto</team_name>
 		</team>
 		<team>
-			<team_name>Takada</team_name>
+			<team_name>A.I.N.</team_name>
 		</team>
 		<team>
-			<team_name>M.B. Kusatsu</team_name>
+			<team_name>T. Osaka</team_name>
 		</team>
 		<team>
-			<team_name>Kyoto S.</team_name>
+			<team_name>Kyoto B.</team_name>
 		</team>
 	</teams>
 </league>
\ No newline at end of file
diff --git a/support_files/definitions/japan/league_japan4-2.xml b/support_files/definitions/japan/league_japan4-2.xml
index 448d9497..2341dcc3 100644
--- a/support_files/definitions/japan/league_japan4-2.xml
+++ b/support_files/definitions/japan/league_japan4-2.xml
@@ -13,29 +13,29 @@
 	<layer>4</layer>
 
 	<teams>
-		<team>
-			<team_name>S. Chugoku</team_name>
-		</team>
 		<team>
 			<team_name>F. Okayama</team_name>
 		</team>
 		<team>
-			<team_name>Hiroshima F.</team_name>
+			<team_name>S. Chugoku</team_name>
 		</team>
 		<team>
-			<team_name>Iwami</team_name>
-		</team>
-		<team>
-			<team_name>H. Kasado</team_name>
-		</team>
-		<team>
-			<team_name>J.F.E. S.N.N.</team_name>
+			<team_name>C. Chugoku</team_name>
 		</team>
 		<team>
 			<team_name>R. Yamaguchi</team_name>
 		</team>
 		<team>
-			<team_name>C. Chugoku</team_name>
+			<team_name>Hiroshima F.</team_name>
+		</team>
+		<team>
+			<team_name>J.F.E. S.N.N.</team_name>
+		</team>
+		<team>
+			<team_name>H. Kasado</team_name>
+		</team>
+		<team>
+			<team_name>Iwami</team_name>
 		</team>
 	</teams>
 </league>
\ No newline at end of file
diff --git a/support_files/definitions/japan/league_japan4-3.xml b/support_files/definitions/japan/league_japan4-3.xml
index bae324d1..c2470617 100644
--- a/support_files/definitions/japan/league_japan4-3.xml
+++ b/support_files/definitions/japan/league_japan4-3.xml
@@ -22,29 +22,29 @@
 	</prom_rel>
 
 	<teams>
-		<team>
-			<team_name>H. Luminozo</team_name>
-		</team>
-		<team>
-			<team_name>Saitama</team_name>
-		</team>
-		<team>
-			<team_name>M.S.D.F. Atsugi M.</team_name>
-		</team>
-		<team>
-			<team_name>Toho T.</team_name>
-		</team>
 		<team>
 			<team_name>Yokohama S.C.C.</team_name>
 		</team>
+		<team>
+			<team_name>H.L. Sayama</team_name>
+		</team>
 		<team>
 			<team_name>Yaita</team_name>
 		</team>
 		<team>
-			<team_name>Hanno B.</team_name>
+			<team_name>Saitama</team_name>
 		</team>
 		<team>
 			<team_name>T. Fuchu</team_name>
 		</team>
+		<team>
+			<team_name>Toho T.</team_name>
+		</team>
+		<team>
+			<team_name>Machida Z.</team_name>
+		</team>
+		<team>
+			<team_name>H. Tochigi</team_name>
+		</team>
 	</teams>
 </league>
\ No newline at end of file
diff --git a/support_files/definitions/japan/league_japan4-4.xml b/support_files/definitions/japan/league_japan4-4.xml
index c049c7b3..12b879ea 100644
--- a/support_files/definitions/japan/league_japan4-4.xml
+++ b/support_files/definitions/japan/league_japan4-4.xml
@@ -25,12 +25,6 @@
 		<team>
 			<team_name>N. Hokkaido</team_name>
 		</team>
-		<team>
-			<team_name>B. Hakodate</team_name>
-		</team>
-		<team>
-			<team_name>Ashikawa C.S.C.</team_name>
-		</team>
 		<team>
 			<team_name>B. Hokkaido</team_name>
 		</team>
@@ -38,7 +32,7 @@
 			<team_name>Sapporo</team_name>
 		</team>
 		<team>
-			<team_name>T. Kuriyama</team_name>
+			<team_name>B. Hakodate</team_name>
 		</team>
 		<team>
 			<team_name>T. Hokkaido</team_name>
@@ -46,5 +40,11 @@
 		<team>
 			<team_name>Tokachi F.S.</team_name>
 		</team>
+		<team>
+			<team_name>T. Kuriyama</team_name>
+		</team>
+		<team>
+			<team_name>Ashikawa C.S.C.</team_name>
+		</team>
 	</teams>
 </league>
\ No newline at end of file
diff --git a/support_files/definitions/japan/league_japan4-5.xml b/support_files/definitions/japan/league_japan4-5.xml
index f2ad00c1..7c053d5a 100644
--- a/support_files/definitions/japan/league_japan4-5.xml
+++ b/support_files/definitions/japan/league_japan4-5.xml
@@ -22,29 +22,29 @@
 	</prom_rel>
 	
 	<teams>
-		<team>
-			<team_name>T. Akita</team_name>
-		</team>
 		<team>
 			<team_name>G. Morioka</team_name>
 		</team>
-		<team>
-			<team_name>Primeiro</team_name>
-		</team>
-		<team>
-			<team_name>W. Shiogama</team_name>
-		</team>
 		<team>
 			<team_name>N. Tokin</team_name>
 		</team>
 		<team>
-			<team_name>N.S. Kamaishi</team_name>
+			<team_name>Primeiro</team_name>
+		</team>
+		<team>
+			<team_name>Sendai N.</team_name>
+		</team>
+		<team>
+			<team_name>W. Shiogama</team_name>
 		</team>
 		<team>
 			<team_name>Morioka Z.</team_name>
 		</team>
 		<team>
-			<team_name>Sendai N.</team_name>
+			<team_name>N.S. Kamaishi</team_name>
+		</team>
+		<team>
+			<team_name>Furukawa</team_name>
 		</team>
 	</teams>
 </league>
\ No newline at end of file
diff --git a/support_files/definitions/japan/league_japan4-6.xml b/support_files/definitions/japan/league_japan4-6.xml
index 2b6c3111..f261095c 100644
--- a/support_files/definitions/japan/league_japan4-6.xml
+++ b/support_files/definitions/japan/league_japan4-6.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <league>
 	<sid>japan4-6</sid>
-	<name>Hoku-shin-etsu League 1</name>
-	<short_name>Hoku-shin-etsu 1</short_name>
+	<name>Hokushinetsu League 1</name>
+	<short_name>Hokushinetsu 1</short_name>
 	<symbol>flag_japan.png</symbol>
 	<first_week>8</first_week>
 	<week_gap>1</week_gap>
@@ -29,10 +29,13 @@
 	
 	<teams>
 		<team>
-			<team_name>Nagano E.</team_name>
+			<team_name>A. Niigata J.S.C.</team_name>
 		</team>
 		<team>
-			<team_name>A. Niigata J.S.C.</team_name>
+			<team_name>Matsumoto Yamaga</team_name>
+		</team>
+		<team>
+			<team_name>Nagano E.</team_name>
 		</team>
 		<team>
 			<team_name>Z. Kanazawa</team_name>
@@ -41,16 +44,13 @@
 			<team_name>F. Ishikawa</team_name>
 		</team>
 		<team>
-			<team_name>Teihens</team_name>
+			<team_name>Niigata U.</team_name>
 		</team>
 		<team>
 			<team_name>Ueda G.</team_name>
 		</team>
 		<team>
-			<team_name>Niigata U.</team_name>
-		</team>
-		<team>
-			<team_name>Matsumoto Yamaga</team_name>
+			<team_name>V. Toyama</team_name>
 		</team>
 	</teams>
 </league>
\ No newline at end of file
diff --git a/support_files/definitions/japan/league_japan4-7.xml b/support_files/definitions/japan/league_japan4-7.xml
index a8574c25..68cc87df 100644
--- a/support_files/definitions/japan/league_japan4-7.xml
+++ b/support_files/definitions/japan/league_japan4-7.xml
@@ -26,26 +26,26 @@
 		<team>
 			<team_name>Shizuoka</team_name>
 		</team>
-		<team>
-			<team_name>Chukyo U.</team_name>
-		</team>
 		<team>
 			<team_name>Y. Valente</team_name>
 		</team>
-		<team>
-			<team_name>Fujieda C.H.</team_name>
-		</team>
-		<team>
-			<team_name>M. Kogyo</team_name>
-		</team>
-		<team>
-			<team_name>C.B. Fujieda</team_name>
-		</team>
 		<team>
 			<team_name>S.K. Chukyo</team_name>
 		</team>
 		<team>
-			<team_name>Gifu</team_name>
+			<team_name>M. Kogyo</team_name>
+		</team>
+		<team>
+			<team_name>Fujieda C.H.</team_name>
+		</team>
+		<team>
+			<team_name>H. Suzuka</team_name>
+		</team>
+		<team>
+			<team_name>Kasugai</team_name>
+		</team>
+		<team>
+			<team_name>Chukyo U.</team_name>
 		</team>
 	</teams>
 </league>
\ No newline at end of file
diff --git a/support_files/definitions/japan/league_japan4-8.xml b/support_files/definitions/japan/league_japan4-8.xml
index fb48c816..f6933817 100644
--- a/support_files/definitions/japan/league_japan4-8.xml
+++ b/support_files/definitions/japan/league_japan4-8.xml
@@ -14,28 +14,28 @@
 	
 	<teams>
 		<team>
-			<team_name>Nankoku K.</team_name>
+			<team_name>Kamatamare S.</team_name>
 		</team>
 		<team>
-			<team_name>S. Tokushima</team_name>
+			<team_name>Nankoku K.</team_name>
 		</team>
 		<team>
 			<team_name>Ehime S.</team_name>
 		</team>
 		<team>
-			<team_name>Kamatamare S.</team_name>
+			<team_name>S. Tokushima</team_name>
 		</team>
 		<team>
 			<team_name>Ventana</team_name>
 		</team>
+		<team>
+			<team_name>Showa</team_name>
+		</team>
 		<team>
 			<team_name>Alex</team_name>
 		</team>
 		<team>
 			<team_name>Sanwa</team_name>
 		</team>
-		<team>
-			<team_name>Showa</team_name>
-		</team>
 	</teams>
 </league>
\ No newline at end of file
diff --git a/support_files/definitions/japan/league_japan4-9.xml b/support_files/definitions/japan/league_japan4-9.xml
index c5a256ec..8a147fe0 100644
--- a/support_files/definitions/japan/league_japan4-9.xml
+++ b/support_files/definitions/japan/league_japan4-9.xml
@@ -13,6 +13,9 @@
 	<layer>4</layer>
 	
 	<teams>
+		<team>
+			<team_name>H.L. Miyazaki</team_name>
+		</team>
 		<team>
 			<team_name>V.V. Nagasaki</team_name>
 		</team>
diff --git a/support_files/definitions/japan/league_japan5-1.xml b/support_files/definitions/japan/league_japan5-1.xml
index 89fcdd9e..5ceb8d28 100644
--- a/support_files/definitions/japan/league_japan5-1.xml
+++ b/support_files/definitions/japan/league_japan5-1.xml
@@ -22,29 +22,29 @@
 	</prom_rel>
 
 	<teams>
+		<team>
+			<team_name>Kyoto S.</team_name>
+		</team>
+		<team>
+			<team_name>Takada</team_name>
+		</team>
 		<team>
 			<team_name>H. Osaka</team_name>
 		</team>
 		<team>
-			<team_name>Kyoto B.</team_name>
-		</team>
-		<team>
-			<team_name>R.G. Koka</team_name>
-		</team>
-		<team>
-			<team_name>T. Osaka</team_name>
-		</team>
-		<team>
-			<team_name>Kihoku</team_name>
+			<team_name>Riseisha</team_name>
 		</team>
 		<team>
 			<team_name>M. H.I. Kobe</team_name>
 		</team>
 		<team>
-			<team_name>Kobe C.</team_name>
+			<team_name>Kihoku</team_name>
 		</team>
 		<team>
-			<team_name>Riseisha</team_name>
+			<team_name>R.G. Koka</team_name>
+		</team>
+		<team>
+			<team_name>Kobe C.</team_name>
 		</team>
 	</teams>
 </league>
\ No newline at end of file
diff --git a/support_files/definitions/japan/league_japan5-3.xml b/support_files/definitions/japan/league_japan5-3.xml
index a0687949..a23a21ba 100644
--- a/support_files/definitions/japan/league_japan5-3.xml
+++ b/support_files/definitions/japan/league_japan5-3.xml
@@ -24,28 +24,28 @@
 
 	<teams>
 		<team>
-			<team_name>A. Tokyo</team_name>
+			<team_name>M.S.D.F. Atsugi M.</team_name>
 		</team>
 		<team>
-			<team_name>H. Tochigi</team_name>
-		</team>
-		<team>
-			<team_name>Nirasaki A.</team_name>
-		</team>
-		<team>
-			<team_name>Kanagawa T.</team_name>
-		</team>
-		<team>
-			<team_name>Ome</team_name>
+			<team_name>Hanno B.</team_name>
 		</team>
 		<team>
 			<team_name>F. Chiba</team_name>
 		</team>
 		<team>
-			<team_name>A. Kamisu</team_name>
+			<team_name>Nirasaki A.</team_name>
 		</team>
 		<team>
-			<team_name>Machida Z.</team_name>
+			<team_name>Ome</team_name>
+		</team>
+		<team>
+			<team_name>Kanagawa T.</team_name>
+		</team>
+		<team>
+			<team_name>Saitama Y.</team_name>
+		</team>
+		<team>
+			<team_name>Ibaraki D.</team_name>
 		</team>
 	</teams>
 </league>
\ No newline at end of file
diff --git a/support_files/definitions/japan/league_japan5-4a.xml b/support_files/definitions/japan/league_japan5-4a.xml
index ad79b5df..889d3b48 100644
--- a/support_files/definitions/japan/league_japan5-4a.xml
+++ b/support_files/definitions/japan/league_japan5-4a.xml
@@ -18,19 +18,19 @@
 			<team_name>Sapporo W.</team_name>
 		</team>
 		<team>
-			<team_name>W.S. Kyubin</team_name>
+			<team_name>Sapporo H.</team_name>
 		</team>
 		<team>
-			<team_name>B.O. Sapporo</team_name>
-		</team>
-		<team>
-			<team_name>Mikahu</team_name>
+			<team_name>Vankei</team_name>
 		</team>
 		<team>
 			<team_name>Otaru</team_name>
 		</team>
 		<team>
-			<team_name>Vankei</team_name>
+			<team_name>Mikaho</team_name>
+		</team>
+		<team>
+			<team_name>B.O. Sapporo</team_name>
 		</team>
 	</teams>
 </league>
\ No newline at end of file
diff --git a/support_files/definitions/japan/league_japan5-4b.xml b/support_files/definitions/japan/league_japan5-4b.xml
index cad612d3..d9f3349c 100644
--- a/support_files/definitions/japan/league_japan5-4b.xml
+++ b/support_files/definitions/japan/league_japan5-4b.xml
@@ -8,15 +8,12 @@
 	<week_gap>1</week_gap>
 	<average_talent>3975</average_talent>
 	<names_file>japan</names_file>
-	<round_robins>2</round_robins>
+	<round_robins>1</round_robins>
 	<break>5</break>
 	<layer>5</layer>
 	
 	
 	<teams>
-		<team>
-			<team_name>Naie</team_name>
-		</team>
 		<team>
 			<team_name>K. Ashikawa</team_name>
 		</team>
@@ -32,6 +29,9 @@
 		<team>
 			<team_name>Sorachi N.</team_name>
 		</team>
+		<team>
+			<team_name>Naie</team_name>
+		</team>
 		<team>
 			<team_name>R. Sorachi</team_name>
 		</team>
diff --git a/support_files/definitions/japan/league_japan5-4c.xml b/support_files/definitions/japan/league_japan5-4c.xml
index 4db492e3..40974917 100644
--- a/support_files/definitions/japan/league_japan5-4c.xml
+++ b/support_files/definitions/japan/league_japan5-4c.xml
@@ -15,22 +15,22 @@
 	
 	<teams>
 		<team>
-			<team_name>K. Obihiro</team_name>
-		</team>
-		<team>
-			<team_name>B.R. Kushiro</team_name>
-		</team>
-		<team>
-			<team_name>D.A.K. Abashiri</team_name>
+			<team_name>B. Kushiro</team_name>
 		</team>
 		<team>
 			<team_name>C. Abashiri</team_name>
 		</team>
 		<team>
-			<team_name>B. Kushiro</team_name>
+			<team_name>B.R. Kushiro</team_name>
+		</team>
+		<team>
+			<team_name>K. Obihiro</team_name>
 		</team>
 		<team>
 			<team_name>Ikeda A.</team_name>
 		</team>
+		<team>
+			<team_name>D.A.K. Abashiri</team_name>
+		</team>
 	</teams>
 </league>
\ No newline at end of file
diff --git a/support_files/definitions/japan/league_japan5-4d.xml b/support_files/definitions/japan/league_japan5-4d.xml
index 9a63254e..7fd730a7 100644
--- a/support_files/definitions/japan/league_japan5-4d.xml
+++ b/support_files/definitions/japan/league_japan5-4d.xml
@@ -14,23 +14,23 @@
 	
 	
 	<teams>
+		<team>
+			<team_name>S. Hakodate</team_name>
+		</team>
 		<team>
 			<team_name>N.S. Muroran</team_name>
 		</team>
 		<team>
 			<team_name>W.K. R. Tomakomai</team_name>
 		</team>
-		<team>
-			<team_name>S. Hakodate</team_name>
-		</team>
 		<team>
 			<team_name>Hakodate C.H.</team_name>
 		</team>
-		<team>
-			<team_name>J.S.W. Muroran</team_name>
-		</team>
 		<team>
 			<team_name>S. Tomakomai</team_name>
 		</team>
+		<team>
+			<team_name>J.S.W. Muroran</team_name>
+		</team>
 	</teams>
 </league>
\ No newline at end of file
diff --git a/support_files/definitions/japan/league_japan5-5a.xml b/support_files/definitions/japan/league_japan5-5a.xml
index 9191dbee..6327ebca 100644
--- a/support_files/definitions/japan/league_japan5-5a.xml
+++ b/support_files/definitions/japan/league_japan5-5a.xml
@@ -14,9 +14,6 @@
 	
 	
 	<teams>
-		<team>
-			<team_name>Tono</team_name>
-		</team>
 		<team>
 			<team_name>Akita C.</team_name>
 		</team>
@@ -24,10 +21,7 @@
 			<team_name>Mizuzawa</team_name>
 		</team>
 		<team>
-			<team_name>A. Aomori</team_name>
-		</team>
-		<team>
-			<team_name>Hokuto</team_name>
+			<team_name>Tono</team_name>
 		</team>
 		<team>
 			<team_name>Fuji</team_name>
@@ -35,6 +29,12 @@
 		<team>
 			<team_name>V. Hachinohe</team_name>
 		</team>
+		<team>
+			<team_name>Hokuto</team_name>
+		</team>
+		<team>
+			<team_name>A. Aomori</team_name>
+		</team>
 		<team>
 			<team_name>T. Shinwakai</team_name>
 		</team>
diff --git a/support_files/definitions/japan/league_japan5-5b.xml b/support_files/definitions/japan/league_japan5-5b.xml
index 2489bab0..a3f2ecf4 100644
--- a/support_files/definitions/japan/league_japan5-5b.xml
+++ b/support_files/definitions/japan/league_japan5-5b.xml
@@ -9,31 +9,28 @@
 	<average_talent>4000</average_talent>
 	<names_file>japan</names_file>
 	<round_robins>2</round_robins>
-	<break>5</break>
+	<break>7</break>
 	<layer>5</layer>
 	
 	
 	<teams>
 		<team>
-			<team_name>Furukawa</team_name>
+			<team_name>M. Matsushima</team_name>
 		</team>
 		<team>
 			<team_name>N. Koriyama</team_name>
 		</team>
-		<team>
-			<team_name>M. Matsushima</team_name>
-		</team>
-		<team>
-			<team_name>Kureha</team_name>
-		</team>
 		<team>
 			<team_name>Kanai</team_name>
 		</team>
+		<team>
+			<team_name>Shishigahama</team_name>
+		</team>
 		<team>
 			<team_name>P. Fukushima</team_name>
 		</team>
 		<team>
-			<team_name>Shishigahama</team_name>
+			<team_name>Kureha</team_name>
 		</team>
 	</teams>
 </league>
\ No newline at end of file
diff --git a/support_files/definitions/japan/league_japan5-6.xml b/support_files/definitions/japan/league_japan5-6.xml
index 330a944e..0a3ab7ae 100644
--- a/support_files/definitions/japan/league_japan5-6.xml
+++ b/support_files/definitions/japan/league_japan5-6.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <league>
 	<sid>japan5-6</sid>
-	<name>Hoku-shin-etsu League 2</name>
-	<short_name>Hoku-shin-etsu 2</short_name>
+	<name>Hokushinetsu League 2</name>
+	<short_name>Hokushinetsu 2</short_name>
 	<symbol>flag_japan.png</symbol>
 	<first_week>8</first_week>
 	<week_gap>1</week_gap>
@@ -22,6 +22,18 @@
 	</prom_rel>
 	
 	<teams>
+		<team>
+			<team_name>Teihens</team_name>
+		</team>
+		<team>
+			<team_name>Kanazu</team_name>
+		</team>
+		<team>
+			<team_name>T. Niigata</team_name>
+		</team>
+		<team>
+			<team_name>Maruoka P.</team_name>
+		</team>
 		<team>
 			<team_name>Antelope</team_name>
 		</team>
@@ -29,22 +41,10 @@
 			<team_name>Toyama S.</team_name>
 		</team>
 		<team>
-			<team_name>V. Toyama</team_name>
+			<team_name>C. Niigata</team_name>
 		</team>
 		<team>
-			<team_name>T. Niigata</team_name>
-		</team>
-		<team>
-			<team_name>Nissei P.I.</team_name>
-		</team>
-		<team>
-			<team_name>Kanazu</team_name>
-		</team>
-		<team>
-			<team_name>Maruoka P.</team_name>
-		</team>
-		<team>
-			<team_name>L. Komatsu</team_name>
+			<team_name>Nagano O.J.</team_name>
 		</team>
 	</teams>
 </league>
\ No newline at end of file
diff --git a/support_files/definitions/japan/league_japan5-7.xml b/support_files/definitions/japan/league_japan5-7.xml
index 8bc7b5d4..16f1aa8c 100644
--- a/support_files/definitions/japan/league_japan5-7.xml
+++ b/support_files/definitions/japan/league_japan5-7.xml
@@ -23,13 +23,7 @@
 	
 	<teams>
 		<team>
-			<team_name>H. Suzuka</team_name>
-		</team>
-		<team>
-			<team_name>Nagoya</team_name>
-		</team>
-		<team>
-			<team_name>Fuyo</team_name>
+			<team_name>C.B. Fujieda</team_name>
 		</team>
 		<team>
 			<team_name>K-M. Toyokawa</team_name>
@@ -38,13 +32,16 @@
 			<team_name>M.H. T.C.</team_name>
 		</team>
 		<team>
-			<team_name>Kasugai</team_name>
+			<team_name>Nagoya</team_name>
 		</team>
 		<team>
-			<team_name>Nagoya W.</team_name>
+			<team_name>Fuyo</team_name>
 		</team>
 		<team>
 			<team_name>Toyota M.</team_name>
 		</team>
+		<team>
+			<team_name>Nagoya W.</team_name>
+		</team>
 	</teams>
 </league>
\ No newline at end of file