From e9d95752faeeeaef3e4a0645755b7144ea78caca Mon Sep 17 00:00:00 2001
From: tsigiarocc <tsigiarocc@localhost>
Date: Thu, 1 Jan 2009 06:55:07 +0000
Subject: [PATCH] Removed old scg folder.

---
 .../definitions/europe/scg/country_scg.xml    |  25 ----
 .../definitions/europe/scg/cup_scg.xml        | 124 ------------------
 .../europe/scg/cup_scg_prom_games1.xml        |  41 ------
 .../definitions/europe/scg/league_scg1.xml    |  61 ---------
 .../definitions/europe/scg/league_scg2.xml    |  91 -------------
 .../definitions/europe/scg/league_scg3a.xml   |  73 -----------
 .../definitions/europe/scg/league_scg3b.xml   |  73 -----------
 .../definitions/europe/scg/league_scg3c.xml   |  73 -----------
 .../definitions/europe/scg/league_scg3d.xml   |  73 -----------
 .../europe/scotland/country_scotland.xml      |   1 -
 .../europe/scotland/cup_scotland_league.xml   |  50 +++++--
 11 files changed, 38 insertions(+), 647 deletions(-)
 delete mode 100644 support_files/definitions/europe/scg/country_scg.xml
 delete mode 100644 support_files/definitions/europe/scg/cup_scg.xml
 delete mode 100644 support_files/definitions/europe/scg/cup_scg_prom_games1.xml
 delete mode 100644 support_files/definitions/europe/scg/league_scg1.xml
 delete mode 100755 support_files/definitions/europe/scg/league_scg2.xml
 delete mode 100755 support_files/definitions/europe/scg/league_scg3a.xml
 delete mode 100755 support_files/definitions/europe/scg/league_scg3b.xml
 delete mode 100755 support_files/definitions/europe/scg/league_scg3c.xml
 delete mode 100755 support_files/definitions/europe/scg/league_scg3d.xml

diff --git a/support_files/definitions/europe/scg/country_scg.xml b/support_files/definitions/europe/scg/country_scg.xml
deleted file mode 100644
index 4b87a40f..00000000
--- a/support_files/definitions/europe/scg/country_scg.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<country>
-  <name>Serbia</name>
-  <rating>7</rating>
-  <symbol>flag_scg.png</symbol>
-  <sid>scg</sid>
-
-  <leagues>
-    <league>scg1</league>
-    <league>scg2</league>
-    <league>scg3a</league>
-    <league>scg3b</league>
-    <league>scg3c</league>
-    <league>scg3d</league>
-  </leagues>
-
-  <cups>
-    <cup>scg</cup>
-    <cup>scg_prom_games1</cup>
-    <cup>europe_uefa</cup>
-    <cup>europe_champ_league</cup>
-    <cup>supercup_europe_uefa</cup>
-    <cup>supercup_europe_intercontinental</cup>
-  </cups>
-</country>
diff --git a/support_files/definitions/europe/scg/cup_scg.xml b/support_files/definitions/europe/scg/cup_scg.xml
deleted file mode 100644
index 5f441e75..00000000
--- a/support_files/definitions/europe/scg/cup_scg.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cup>
-  <name>Lav Kup Srbije</name>
-  <short_name>Lav Kup</short_name>
-  <symbol>flag_scg.png</symbol>
-  <sid>scg</sid>
-  <yellow_red>3</yellow_red>
-  <last_week>44</last_week>
-  <week_gap>5</week_gap>
-  <property>national</property>
-
- <cup_rounds>
-  <cup_round>
-    <home_away>0</home_away>
-
-    <choose_teams>
-      <choose_team>
-	<choose_team_sid>scg3a</choose_team_sid>
-	<number_of_teams>2</number_of_teams>
-	  <start_idx>1</start_idx>
-	  <end_idx>16</end_idx>
-	  <randomly>1</randomly>
-      </choose_team>
-
-      <choose_team>
-	<choose_team_sid>scg3b</choose_team_sid>
-	<number_of_teams>1</number_of_teams>
-	  <start_idx>1</start_idx>
-	  <end_idx>16</end_idx>
-	  <randomly>1</randomly>
-      </choose_team>
-
-      <choose_team>
-	<choose_team_sid>scg3c</choose_team_sid>
-	<number_of_teams>1</number_of_teams>
-	  <start_idx>1</start_idx>
-	  <end_idx>16</end_idx>
-	  <randomly>1</randomly>
-      </choose_team>
-
-      <choose_team>
-	<choose_team_sid>scg3d</choose_team_sid>
-	<number_of_teams>2</number_of_teams>
-	  <start_idx>1</start_idx>
-	  <end_idx>16</end_idx>
-	  <randomly>1</randomly>
-      </choose_team>
-    </choose_teams>
-    <byes>0</byes>
-    <delay>-9</delay>
-  </cup_round>
-
-  <cup_round>
-    <home_away>0</home_away>
-
-    <choose_teams>
-      <choose_team>
-	<choose_team_sid>scg3a</choose_team_sid>
-	<number_of_teams>1</number_of_teams>
-	  <start_idx>1</start_idx>
-	  <end_idx>16</end_idx>
-	  <randomly>1</randomly>
-      </choose_team>
-
-      <choose_team>
-	<choose_team_sid>scg3b</choose_team_sid>
-	<number_of_teams>1</number_of_teams>
-	  <start_idx>1</start_idx>
-	  <end_idx>16</end_idx>
-	  <randomly>1</randomly>
-      </choose_team>
-
-      <choose_team>
-	<choose_team_sid>scg3c</choose_team_sid>
-	<number_of_teams>1</number_of_teams>
-	  <start_idx>1</start_idx>
-	  <end_idx>16</end_idx>
-	  <randomly>1</randomly>
-      </choose_team>
-
-      <choose_team>
-	<choose_team_sid>scg3d</choose_team_sid>
-	<number_of_teams>1</number_of_teams>
-	  <start_idx>1</start_idx>
-	  <end_idx>16</end_idx>
-	  <randomly>1</randomly>
-      </choose_team>
-
-      <choose_team>
-	<choose_team_sid>scg2</choose_team_sid>
-	  <number_of_teams>13</number_of_teams>
-	  <start_idx>1</start_idx>
-	  <end_idx>18</end_idx>
-	  <randomly>1</randomly>
-      </choose_team>
-
-      <choose_team>
-	<choose_team_sid>scg1</choose_team_sid>
-      </choose_team>
-    </choose_teams>
-    <byes>0</byes>
-    <delay>-11</delay>
-  </cup_round>
-
-  <cup_round>
-    <home_away>0</home_away>
-    <delay>-9</delay>
-  </cup_round>
-
-  <cup_round>
-    <home_away>0</home_away>
-  </cup_round>
-
-  <cup_round>
-    <home_away>0</home_away>
-    <delay>2</delay>
-  </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/europe/scg/cup_scg_prom_games1.xml b/support_files/definitions/europe/scg/cup_scg_prom_games1.xml
deleted file mode 100644
index 1d4716db..00000000
--- a/support_files/definitions/europe/scg/cup_scg_prom_games1.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<cup>
-  <name>Srbija Promotion</name>
-  <short_name>S. Prom.</short_name>
-  <symbol>flag_scg.png</symbol>
-  <sid>scg_prom_games1</sid>
-  <add_week>1000</add_week>
-  <property>national</property>
-  <property>highlight2</property>
-  <yellow_red>3</yellow_red>
-
-  <cup_rounds>
-
-    <cup_round>
-      <choose_teams>
-	<choose_team>
-	  <choose_team_sid>scg2</choose_team_sid>
-	  <number_of_teams>4</number_of_teams>
-	  <start_idx>3</start_idx>
-	  <end_idx>6</end_idx>
-	</choose_team>
-      </choose_teams>
-     </cup_round>
-
-    <cup_round>
-    </cup_round>
-
-    <cup_round>
-	<new_teams>1</new_teams>
-      <choose_teams>
-	<choose_team>
-	  <choose_team_sid>scg1</choose_team_sid>
-	  <number_of_teams>1</number_of_teams>
-	  <start_idx>10</start_idx>
-	  <end_idx>10</end_idx>
-	</choose_team>
-      </choose_teams>
-    </cup_round>
-
-  </cup_rounds>
-
-</cup>
diff --git a/support_files/definitions/europe/scg/league_scg1.xml b/support_files/definitions/europe/scg/league_scg1.xml
deleted file mode 100644
index 1844d46a..00000000
--- a/support_files/definitions/europe/scg/league_scg1.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<league>
-  <sid>scg1</sid>
-  <name>Super Liga Srbije</name>
-  <short_name>Superl.</short_name>
-  <symbol>flag_scg.png</symbol>
-  <first_week>1</first_week>
-  <week_gap>1</week_gap>
-  <average_talent>7400</average_talent>
-  <round_robins>3</round_robins>
-  <names_file>scg</names_file>
-  <yellow_red>5</yellow_red>
-
-  <prom_rel>
-    <prom_rel_element>
-      <rank_start>11</rank_start>
-      <rank_end>12</rank_end>
-      <dest_sid>scg2</dest_sid>
-      <prom_rel_type>relegation</prom_rel_type>
-    </prom_rel_element>
-  </prom_rel>
-
-  <teams>
-    <team>
-      <team_name>B. Zrenjanin</team_name>
-    </team>
-    <team>
-      <team_name>B. Čačak</team_name>
-    </team>
-    <team>
-      <team_name>Č. Belgrade</team_name>
-    </team>
-    <team>
-      <team_name>H. Kula</team_name>
-    </team> 
-   <team>
-      <team_name>J. Ivanjica</team_name>
-    </team>
-    <team>
-      <team_name>Jagodina</team_name>
-    </team>
-    <team>
-      <team_name>N. Kruševac</team_name>
-    </team>
-    <team>
-      <team_name>O. Belgrade</team_name>
-    </team>
-    <team>
-      <team_name>P. Belgrade</team_name>
-    </team>
-    <team>
-      <team_name>R. Belgrade</team_name>
-    </team>
-    <team>
-      <team_name>C. Z. Belgrade</team_name>
-    </team>
-    <team>
-      <team_name>V. Novi Sad</team_name>
-    </team>
-  </teams>
-</league>
diff --git a/support_files/definitions/europe/scg/league_scg2.xml b/support_files/definitions/europe/scg/league_scg2.xml
deleted file mode 100755
index bac3f44b..00000000
--- a/support_files/definitions/europe/scg/league_scg2.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<league>
-  <sid>scg2</sid>
-  <name>Prva Liga Srbija</name>
-  <short_name>PLS</short_name>
-  <symbol>flag_scg.png</symbol>
-  <first_week>1</first_week>
-  <week_gap>1</week_gap>
-  <average_talent>6700</average_talent>
-  <names_file>scg</names_file>
-  <yellow_red>5</yellow_red>
-
-  <prom_rel>
-    <prom_rel_element>
-      <rank_start>1</rank_start>
-      <rank_end>2</rank_end>
-      <dest_sid>scg1</dest_sid>
-      <prom_rel_type>promotion</prom_rel_type>
-    </prom_rel_element>
-
-    <prom_rel_element>
-      <rank_start>15</rank_start>
-      <rank_end>18</rank_end>
-      <dest_sid>scg3a scg3b scg3c scg3d</dest_sid>
-      <prom_rel_type>relegation</prom_rel_type>
-    </prom_rel_element>
-
-    <prom_games>
-      <prom_games_dest_sid>scg1</prom_games_dest_sid>
-      <prom_games_cup_sid>scg_prom_games1</prom_games_cup_sid>
-      <prom_games_loser_sid>scg2</prom_games_loser_sid>
-    </prom_games>
-  </prom_rel>
-
-  <teams>
-    <team>
-      <team_name>Bežanija</team_name>
-    </team>
-    <team>
-      <team_name>Borča</team_name>
-    </team>
-    <team>
-      <team_name>C. Pivara</team_name>
-    </team>
-    <team>
-      <team_name>D. Vranje</team_name>
-    </team>
-    <team>
-      <team_name>H. Beograd</team_name>
-    </team>
-    <team>
-      <team_name>Inđija</team_name>
-    </team>
-    <team>
-      <team_name>K. Lazarevac</team_name>
-    </team>
-    <team>
-      <team_name>M. G. Milanovac</team_name>
-    </team>
-    <team>
-      <team_name>M. Radnik</team_name>
-    </team>
-    <team>
-      <team_name>M. Apatin</team_name>
-    </team>
-    <team>
-      <team_name>M. Lučani</team_name>
-    </team>
-    <team>
-      <team_name>Novi Pazar</team_name>
-    </team>
-    <team>
-      <team_name>Novi Sad</team_name>
-    </team>
-    <team>
-      <team_name>Sevojno</team_name>
-    </team>
-    <team>
-      <team_name>Smederevo</team_name>
-    </team>
-    <team>
-      <team_name>Srem</team_name>
-    </team>
-    <team>
-      <team_name>Voždovac</team_name>
-    </team> 
-   <team>
-      <team_name>Subotica</team_name>
-    </team>
-  </teams>
-</league>
diff --git a/support_files/definitions/europe/scg/league_scg3a.xml b/support_files/definitions/europe/scg/league_scg3a.xml
deleted file mode 100755
index f54f42de..00000000
--- a/support_files/definitions/europe/scg/league_scg3a.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<league>
-  <sid>scg3a</sid>
-  <name>Srpska Liga Istok</name>
-  <short_name>S. L. I.</short_name>
-  <symbol>flag_scg.png</symbol>
-  <first_week>1</first_week>
-  <week_gap>1</week_gap>
-  <average_talent>6100</average_talent>
-  <names_file>scg</names_file>
-  <yellow_red>5</yellow_red>
-  <layer>3</layer>
-
-  <prom_rel>
-    <prom_rel_element>
-      <rank_start>1</rank_start>
-      <rank_end>1</rank_end>
-      <dest_sid>scg2</dest_sid>
-      <prom_rel_type>promotion</prom_rel_type>
-    </prom_rel_element>
-  </prom_rel>
-
-  <teams>
-    <team>
-      <team_name>B. Dimitrovgrad</team_name>
-    </team>
-    <team>
-      <team_name>C. Konstantin</team_name>
-    </team>
-    <team>
-      <team_name>D. Leskovac</team_name>
-    </team>
-    <team>
-      <team_name>H. Veljko</team_name>
-    </team>
-    <team>
-      <team_name>J. Paraćin</team_name>
-    </team>
-    <team>
-      <team_name>K. Brus</team_name>
-    </team>
-    <team>
-      <team_name>R. Surdulica</team_name>
-    </team>
-    <team>
-      <team_name>R. Niš</team_name>
-    </team>
-    <team>
-      <team_name>R. Pirot</team_name>
-    </team>
-    <team>
-      <team_name>S. Niš</team_name>
-    </team>
-    <team>
-      <team_name>Svrljig</team_name>
-    </team>
-    <team>
-      <team_name>T. Zaječar</team_name>
-    </team>
-    <team>
-      <team_name>Topličanin</team_name>
-    </team>
-    <team>
-      <team_name>V. Vlasotince</team_name>
-    </team>
-    <team>
-      <team_name>Z. Niš</team_name>
-    </team>
-    <team>
-      <team_name>Z. Aleksandrovac</team_name>
-    </team>
-  </teams>
-</league>
diff --git a/support_files/definitions/europe/scg/league_scg3b.xml b/support_files/definitions/europe/scg/league_scg3b.xml
deleted file mode 100755
index 7dfc080a..00000000
--- a/support_files/definitions/europe/scg/league_scg3b.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<league>
-  <sid>scg3b</sid>
-  <name>Srpska Liga Beograd</name>
-  <short_name>S. L. B.</short_name>
-  <symbol>flag_scg.png</symbol>
-  <first_week>1</first_week>
-  <week_gap>1</week_gap>
-  <average_talent>6100</average_talent>
-  <names_file>scg</names_file>
-  <yellow_red>5</yellow_red>
-  <layer>3</layer>
-
-  <prom_rel>
-    <prom_rel_element>
-      <rank_start>1</rank_start>
-      <rank_end>1</rank_end>
-      <dest_sid>scg2</dest_sid>
-      <prom_rel_type>promotion</prom_rel_type>
-    </prom_rel_element>
-  </prom_rel>
-
-  <teams>
-    <team>
-      <team_name>B. Beograd</team_name>
-    </team>
-    <team>
-      <team_name>F. Beograd</team_name>
-    </team>
-    <team>
-      <team_name>Dorćol</team_name>
-    </team>
-    <team>
-      <team_name>Lisović</team_name>
-    </team>
-    <team>
-      <team_name>O. Mladenovac</team_name>
-    </team>
-    <team>
-      <team_name>P. P. Skela</team_name>
-    </team>
-    <team>
-      <team_name>Palilulac</team_name>
-    </team>
-    <team>
-      <team_name>R. Jugopetrol</team_name>
-    </team>
-    <team>
-      <team_name>R. Obrenovac</team_name>
-    </team>
-    <team>
-      <team_name>Si. Beograd</team_name>
-    </team>
-    <team>
-      <team_name>Sopot</team_name>
-    </team>
-    <team>
-      <team_name>Sr. Beograd</team_name>
-    </team>
-    <team>
-      <team_name>Š. Jagnjilo</team_name>
-    </team>
-    <team>
-      <team_name>Teleoptik</team_name>
-    </team>
-    <team>
-      <team_name>Zemun</team_name>
-    </team>
-    <team>
-      <team_name>Ž. Beograd</team_name>
-    </team>
-  </teams>
-</league>
diff --git a/support_files/definitions/europe/scg/league_scg3c.xml b/support_files/definitions/europe/scg/league_scg3c.xml
deleted file mode 100755
index a1017648..00000000
--- a/support_files/definitions/europe/scg/league_scg3c.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<league>
-  <sid>scg3c</sid>
-  <name>Srpska Liga Vojvodina</name>
-  <short_name>S. L. V.</short_name>
-  <symbol>flag_scg.png</symbol>
-  <first_week>1</first_week>
-  <week_gap>1</week_gap>
-  <average_talent>6100</average_talent>
-  <names_file>scg</names_file>
-  <yellow_red>5</yellow_red>
-  <layer>3</layer>
-
-  <prom_rel>
-    <prom_rel_element>
-      <rank_start>1</rank_start>
-      <rank_end>1</rank_end>
-      <dest_sid>scg2</dest_sid>
-      <prom_rel_type>promotion</prom_rel_type>
-    </prom_rel_element>
-  </prom_rel>
-
-  <teams>
-    <team>
-      <team_name>Bačka</team_name>
-    </team>
-    <team>
-      <team_name>B. B. Bačinci</team_name>
-    </team>
-    <team>
-      <team_name>Kikinda</team_name>
-    </team>
-    <team>
-      <team_name>M. Futog</team_name>
-    </team>
-    <team>
-      <team_name>M. B. Jarak</team_name>
-    </team>
-    <team>
-      <team_name>Palić</team_name>
-    </team>
-    <team>
-      <team_name>P. Novi Sad</team_name>
-    </team>
-    <team>
-      <team_name>R. Nova Pazova</team_name>
-    </team>
-    <team>
-      <team_name>R. Sombor</team_name>
-    </team>
-    <team>
-      <team_name>R. Šid</team_name>
-    </team>
-    <team>
-      <team_name>Senta</team_name>
-    </team>
-    <team>
-      <team_name>S. Temerin</team_name>
-    </team>
-    <team>
-      <team_name>S. Ruma</team_name>
-    </team>
-    <team>
-      <team_name>S. Debeljača</team_name>
-    </team>
-    <team>
-      <team_name>T. Ites</team_name>
-    </team>
-    <team>
-      <team_name>Vršac</team_name>
-    </team>
-  </teams>
-</league>
diff --git a/support_files/definitions/europe/scg/league_scg3d.xml b/support_files/definitions/europe/scg/league_scg3d.xml
deleted file mode 100755
index 378b81ea..00000000
--- a/support_files/definitions/europe/scg/league_scg3d.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<league>
-  <sid>scg3d</sid>
-  <name>Srpska Liga Zapad</name>
-  <short_name>S. L. Z.</short_name>
-  <symbol>flag_scg.png</symbol>
-  <first_week>1</first_week>
-  <week_gap>1</week_gap>
-  <average_talent>6100</average_talent>
-  <names_file>scg</names_file>
-  <yellow_red>5</yellow_red>
-  <layer>3</layer>
-
-  <prom_rel>
-    <prom_rel_element>
-      <rank_start>1</rank_start>
-      <rank_end>1</rank_end>
-      <dest_sid>scg2</dest_sid>
-      <prom_rel_type>promotion</prom_rel_type>
-    </prom_rel_element>
-  </prom_rel>
-
-  <teams>
-    <team>
-      <team_name>B. Valjevo</team_name>
-    </team>
-    <team>
-      <team_name>F. Valjevo</team_name>
-    </team>
-    <team>
-      <team_name>J. Ub</team_name>
-    </team>
-    <team>
-      <team_name>Loznica</team_name>
-    </team>
-    <team>
-      <team_name>M. Šabac</team_name>
-    </team>
-    <team>
-      <team_name>M. Kraljevo</team_name>
-    </team>
-    <team>
-      <team_name>Pozarevac</team_name>
-    </team>
-    <team>
-      <team_name>Priboj</team_name>
-    </team>
-    <team>
-      <team_name>R. Klupci</team_name>
-    </team>
-    <team>
-      <team_name>R. Kragujevac</team_name>
-    </team>
-    <team>
-      <team_name>S. Čačak</team_name>
-    </team>
-    <team>
-      <team_name>S. Užice</team_name>
-    </team>
-    <team>
-      <team_name>S. Kraljevo</team_name>
-    </team>
-    <team>
-      <team_name>S. Požega</team_name>
-    </team>
-    <team>
-      <team_name>S. Petrovac na Mlavi</team_name>
-    </team>
-    <team>
-      <team_name>Ž. Lajkovac</team_name>
-    </team>
-  </teams>
-</league>
diff --git a/support_files/definitions/europe/scotland/country_scotland.xml b/support_files/definitions/europe/scotland/country_scotland.xml
index 6ca09c5d..59574b20 100644
--- a/support_files/definitions/europe/scotland/country_scotland.xml
+++ b/support_files/definitions/europe/scotland/country_scotland.xml
@@ -17,7 +17,6 @@
     <cup>scotland_league</cup>
     <cup>europe_uefa</cup>
     <cup>europe_champ_league</cup>
-    <cup>supercup_league_vs_cup</cup>
     <cup>supercup_europe_uefa</cup>
     <cup>supercup_europe_intercontinental</cup>
     <cup>scotland_prom_games2</cup>
diff --git a/support_files/definitions/europe/scotland/cup_scotland_league.xml b/support_files/definitions/europe/scotland/cup_scotland_league.xml
index bd584269..2782186b 100644
--- a/support_files/definitions/europe/scotland/cup_scotland_league.xml
+++ b/support_files/definitions/europe/scotland/cup_scotland_league.xml
@@ -4,22 +4,17 @@
   <short_name>League Cup</short_name>
   <symbol>flag_scotland.png</symbol>
   <sid>scotland_league</sid>
-  <last_week>32</last_week>
+  <last_week>45</last_week>
   <week_gap>6</week_gap>
   <property>national</property>
 
   <cup_rounds>
     <cup_round>
       <home_away>0</home_away>
-      <replay>1</replay>
 
       <choose_teams>
 	<choose_team>
-	  <choose_team_sid>scotland1</choose_team_sid>
-	</choose_team>
-
-	<choose_team>
-	  <choose_team_sid>scotland2</choose_team_sid>
+	  <choose_team_sid>scotland4</choose_team_sid>
 	</choose_team>
 
 	<choose_team>
@@ -27,25 +22,56 @@
 	</choose_team>
 
 	<choose_team>
-	  <choose_team_sid>scotland4</choose_team_sid>
+	  <choose_team_sid>scotland2</choose_team_sid>
+	  <number_of_teams>8</number_of_teams>
+	  <start_idx>3</start_idx>
+	  <end_idx>10</end_idx>
+	  <randomly>1</randomly>
 	</choose_team>
       </choose_teams>
-      <delay>2</delay>
+      <delay>-2</delay>
+      <byes>0</byes>
     </cup_round>
 
     <cup_round>
       <home_away>0</home_away>
-      <replay>1</replay>
+
+      <choose_teams>
+	<choose_team>
+	  <choose_team_sid>scotland2</choose_team_sid>
+	  <number_of_teams>2</number_of_teams>
+	  <start_idx>1</start_idx>
+	  <end_idx>2</end_idx>
+	  <randomly>1</randomly>
+	</choose_team>
+
+	<choose_team>
+	  <choose_team_sid>scotland1</choose_team_sid>
+	  <number_of_teams>8</number_of_teams>
+	  <start_idx>5</start_idx>
+	  <end_idx>12</end_idx>
+	  <randomly>1</randomly>
+	</choose_team>
+      </choose_teams>
+	 <byes>0</byes>
     </cup_round>
 
     <cup_round>
       <home_away>0</home_away>
-      <replay>1</replay>
+
+      <choose_teams>
+	<choose_team>
+	  <choose_team_sid>scotland1</choose_team_sid>
+	  <number_of_teams>4</number_of_teams>
+	  <start_idx>1</start_idx>
+	  <end_idx>4</end_idx>
+	  <randomly>1</randomly>
+	</choose_team>
+      </choose_teams>
     </cup_round>
 
     <cup_round>
       <home_away>0</home_away>
-      <replay>1</replay>
     </cup_round>
 
     <cup_round>