diff --git a/ChangeLog b/ChangeLog
index 5c909e6f..4b110ede 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,11 +10,12 @@
 	- updated Romanian player names
 	- added new images for simulation
 	- added newspaper feature
-	- updated translations (German, French, Romanian)
+	- updated translations
 	- the country selection got some convenience updates
 	- updated Swedish translation (thanks to Daniel Nylander)
 	- added Brazilian Portuguese translation (thanks to Valdinei Martins)
 	- added Portuguese translation (thanks to  Marco Alves)
+	- revamped European cup system (thanks to Tommasi)
 	
 
 06/11/2008: v2.3.0
diff --git a/src/debug.c b/src/debug.c
index 6b8e6c13..8b1c61af 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -109,8 +109,10 @@ debug_action(const gchar *text)
     }
     else if(g_str_has_prefix(text, "goto"))
     {
+        sett_set_int("int_opt_goto_mode", 1);
 	while(week < value)
 	    on_button_new_week_clicked(NULL, NULL);
+        sett_set_int("int_opt_goto_mode", 0);
     }
     else if(g_str_has_prefix(text, "testcom") ||
 	    g_str_has_prefix(text, "tc"))
diff --git a/src/gui.c b/src/gui.c
index e5985d27..4aab6257 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -60,6 +60,16 @@ gui_label_set_text_from_int(GtkLabel *label, gint number, gboolean append)
     gtk_label_set_text(label, buf2);
 }
 
+gdouble
+gui_get_progress_bar_fraction(void)
+{
+    if(sett_int("int_opt_goto_mode"))
+        return 0;
+    
+    return gtk_progress_bar_get_fraction(
+        GTK_PROGRESS_BAR(lookup_widget(window.progress, "progressbar")));
+}
+
 /* Show a window with a progress bar.
    @param value The value of the progress bar. If set to 1
    or < 0 the progress bar window gets destroyed.
@@ -74,6 +84,9 @@ gui_show_progress(gfloat value, const gchar *text, gint pictype)
 
     GtkProgressBar *progressbar = NULL;
 
+    if(sett_int("int_opt_goto_mode"))
+        return;
+
     if(value == 1 || value < 0)
     {
 	window_destroy(&window.progress);
diff --git a/src/gui.h b/src/gui.h
index b2e7bcc7..94c7a470 100644
--- a/src/gui.h
+++ b/src/gui.h
@@ -43,6 +43,9 @@ gui_label_set_text_from_int(GtkLabel *label, gint number, gboolean append);
 void
 gui_show_progress(gfloat value, const gchar *text, gint pictype);
 
+gdouble
+gui_get_progress_bar_fraction(void);
+
 void
 gui_set_arrow_pair(gint pair, gboolean state);
 
diff --git a/src/load_save.c b/src/load_save.c
index 499b6567..83c3e67f 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -87,8 +87,7 @@ load_save_save_game(const gchar *filename)
 	g_print("load_save_save leagues/cups \n");
 
     gui_show_progress(
-	((PROGRESS_MAX * gtk_progress_bar_get_fraction(
-	      GTK_PROGRESS_BAR(lookup_widget(window.progress, "progressbar")))) + 1) / PROGRESS_MAX,
+	((PROGRESS_MAX * gui_get_progress_bar_fraction()) + 1) / PROGRESS_MAX,
 	_("Saving leagues and cups..."),
 	PIC_TYPE_SAVE);
 
@@ -98,8 +97,7 @@ load_save_save_game(const gchar *filename)
 	g_print("load_save_save users \n");
 
     gui_show_progress(
-	((PROGRESS_MAX * gtk_progress_bar_get_fraction(
-	      GTK_PROGRESS_BAR(lookup_widget(window.progress, "progressbar")))) + 1) / PROGRESS_MAX,
+	((PROGRESS_MAX * gui_get_progress_bar_fraction()) + 1) / PROGRESS_MAX,
 	_("Saving users..."),
 	PIC_TYPE_SAVE);
 
@@ -109,8 +107,7 @@ load_save_save_game(const gchar *filename)
 	g_print("load_save_save transfers \n");
 
     gui_show_progress(
-	((PROGRESS_MAX * gtk_progress_bar_get_fraction(
-	      GTK_PROGRESS_BAR(lookup_widget(window.progress, "progressbar")))) + 1) / PROGRESS_MAX,
+	((PROGRESS_MAX * gui_get_progress_bar_fraction()) + 1) / PROGRESS_MAX,
 	_("Saving transfer list..."),
 	PIC_TYPE_SAVE);
 
@@ -120,8 +117,7 @@ load_save_save_game(const gchar *filename)
 	g_print("load_save_save stats \n");
 
     gui_show_progress(
-	((PROGRESS_MAX * gtk_progress_bar_get_fraction(
-	      GTK_PROGRESS_BAR(lookup_widget(window.progress, "progressbar")))) + 1) / PROGRESS_MAX,
+	((PROGRESS_MAX * gui_get_progress_bar_fraction()) + 1) / PROGRESS_MAX,
 	_("Saving season stats..."),
 	PIC_TYPE_SAVE);
 
@@ -131,9 +127,7 @@ load_save_save_game(const gchar *filename)
 	g_print("load_save_save jobs \n");
 
     gui_show_progress(
-	((PROGRESS_MAX * gtk_progress_bar_get_fraction(
-	      GTK_PROGRESS_BAR(
-		  lookup_widget(window.progress, "progressbar")))) + 1) / PROGRESS_MAX,
+	((PROGRESS_MAX * gui_get_progress_bar_fraction()) + 1) / PROGRESS_MAX,
 	/* The 'job exchange' is a list of teams looking for a manager. */
 	_("Saving job exchange..."),
 	PIC_TYPE_SAVE);
@@ -144,9 +138,7 @@ load_save_save_game(const gchar *filename)
 	g_print("load_save_save newspaper \n");
 
     gui_show_progress(
-	((PROGRESS_MAX * gtk_progress_bar_get_fraction(
-	      GTK_PROGRESS_BAR(
-		  lookup_widget(window.progress, "progressbar")))) + 1) / PROGRESS_MAX,
+	((PROGRESS_MAX * gui_get_progress_bar_fraction()) + 1) / PROGRESS_MAX,
 	_("Saving newspaper..."),
 	PIC_TYPE_SAVE);
 
@@ -156,16 +148,14 @@ load_save_save_game(const gchar *filename)
 	g_print("load_save_save misc \n");
 
     gui_show_progress(
-	((PROGRESS_MAX * gtk_progress_bar_get_fraction(
-	      GTK_PROGRESS_BAR(lookup_widget(window.progress, "progressbar")))) + 1) / PROGRESS_MAX,
+	((PROGRESS_MAX * gui_get_progress_bar_fraction()) + 1) / PROGRESS_MAX,
 	_("Saving miscellaneous..."),
 	PIC_TYPE_SAVE);
 
     xml_loadsave_misc_write(prefix);
 
     gui_show_progress(
-	((PROGRESS_MAX * gtk_progress_bar_get_fraction(
-	      GTK_PROGRESS_BAR(lookup_widget(window.progress, "progressbar")))) + 1) / PROGRESS_MAX,
+	((PROGRESS_MAX * gui_get_progress_bar_fraction()) + 1) / PROGRESS_MAX,
 	_("Compressing savegame..."),
 	PIC_TYPE_SAVE);
 
@@ -241,8 +231,7 @@ load_save_load_game(const gchar* filename, gboolean create_main_window)
 	g_print("load_save_load options\n");
 
     gui_show_progress(
-	((PROGRESS_MAX * gtk_progress_bar_get_fraction(
-	      GTK_PROGRESS_BAR(lookup_widget(window.progress, "progressbar")))) + 1) / PROGRESS_MAX,
+	((PROGRESS_MAX * gui_get_progress_bar_fraction()) + 1) / PROGRESS_MAX,
 	_("Loading options..."),
 	PIC_TYPE_LOAD);
 
@@ -256,8 +245,7 @@ load_save_load_game(const gchar* filename, gboolean create_main_window)
 	g_print("load_save_load leagues \n");
 
     gui_show_progress(
-	((PROGRESS_MAX * gtk_progress_bar_get_fraction(
-	      GTK_PROGRESS_BAR(lookup_widget(window.progress, "progressbar")))) + 1) / PROGRESS_MAX,
+	((PROGRESS_MAX * gui_get_progress_bar_fraction()) + 1) / PROGRESS_MAX,
 	_("Loading leagues and cups..."),
 	PIC_TYPE_LOAD);
 
@@ -267,8 +255,7 @@ load_save_load_game(const gchar* filename, gboolean create_main_window)
 	g_print("load_save_load users \n");
 
     gui_show_progress(
-	((PROGRESS_MAX * gtk_progress_bar_get_fraction(
-	      GTK_PROGRESS_BAR(lookup_widget(window.progress, "progressbar")))) + 1) / PROGRESS_MAX,
+	((PROGRESS_MAX * gui_get_progress_bar_fraction()) + 1) / PROGRESS_MAX,
 	_("Loading users..."),
 	PIC_TYPE_LOAD);
 
@@ -278,8 +265,7 @@ load_save_load_game(const gchar* filename, gboolean create_main_window)
 	g_print("load_save_load transfers \n");
 
     gui_show_progress(
-	((PROGRESS_MAX * gtk_progress_bar_get_fraction(
-	      GTK_PROGRESS_BAR(lookup_widget(window.progress, "progressbar")))) + 1) / PROGRESS_MAX,
+	((PROGRESS_MAX * gui_get_progress_bar_fraction()) + 1) / PROGRESS_MAX,
 	_("Loading transfer list..."),
 	PIC_TYPE_LOAD);
 
@@ -289,8 +275,7 @@ load_save_load_game(const gchar* filename, gboolean create_main_window)
 	g_print("load_save_load stats \n");
 
     gui_show_progress(
-	((PROGRESS_MAX * gtk_progress_bar_get_fraction(
-	      GTK_PROGRESS_BAR(lookup_widget(window.progress, "progressbar")))) + 1) / PROGRESS_MAX,
+	((PROGRESS_MAX * gui_get_progress_bar_fraction()) + 1) / PROGRESS_MAX,
 	_("Loading season stats..."),
 	PIC_TYPE_LOAD);
 
@@ -300,9 +285,7 @@ load_save_load_game(const gchar* filename, gboolean create_main_window)
 	g_print("load_save_load jobs \n");
 
     gui_show_progress(
-	((PROGRESS_MAX * gtk_progress_bar_get_fraction(
-	      GTK_PROGRESS_BAR(
-		  lookup_widget(window.progress, "progressbar")))) + 1) / PROGRESS_MAX,
+	((PROGRESS_MAX * gui_get_progress_bar_fraction()) + 1) / PROGRESS_MAX,
 	/* The 'job exchange' is a list of teams looking for a manager. */
 	_("Loading job exchange..."),
 	PIC_TYPE_LOAD);
@@ -313,9 +296,7 @@ load_save_load_game(const gchar* filename, gboolean create_main_window)
 	g_print("load_save_load newspaper \n");
 
     gui_show_progress(
-	((PROGRESS_MAX * gtk_progress_bar_get_fraction(
-	      GTK_PROGRESS_BAR(
-		  lookup_widget(window.progress, "progressbar")))) + 1) / PROGRESS_MAX,
+	((PROGRESS_MAX * gui_get_progress_bar_fraction()) + 1) / PROGRESS_MAX,
 	_("Loading newspaper..."),
 	PIC_TYPE_LOAD);
 
@@ -325,8 +306,7 @@ load_save_load_game(const gchar* filename, gboolean create_main_window)
 	g_print("load_save_load misc \n");
 
     gui_show_progress(
-	((PROGRESS_MAX * gtk_progress_bar_get_fraction(
-	      GTK_PROGRESS_BAR(lookup_widget(window.progress, "progressbar")))) + 1) / PROGRESS_MAX,
+	((PROGRESS_MAX * gui_get_progress_bar_fraction()) + 1) / PROGRESS_MAX,
 	_("Loading miscellaneous..."),
 	PIC_TYPE_LOAD);
 
diff --git a/src/main.c b/src/main.c
index 4f20f123..6c278fe4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -269,6 +269,7 @@ main_init_variables(void)
 
     /** Some of these (or all) are disabled (set to 1) in supernational
 	country defs. */
+    option_add(&settings, "int_opt_goto_mode", 0, NULL);
     option_add(&settings, "int_opt_disable_finances", 0, NULL);
     option_add(&settings, "int_opt_disable_transfers", 0, NULL);
     option_add(&settings, "int_opt_disable_stadium", 0, NULL);
diff --git a/src/option.c b/src/option.c
index 3c2171fe..ce440c1b 100644
--- a/src/option.c
+++ b/src/option.c
@@ -184,11 +184,18 @@ option_add(OptionList *optionlist, const gchar *name,
     gpointer element = NULL;
 
     if(optionlist->list != NULL)
-	g_datalist_get_data(&optionlist->datalist, name);
+	element = g_datalist_get_data(&optionlist->datalist, name);
     
     if(element != NULL)
-	main_exit_program(EXIT_OPTION_NOT_FOUND, 
-			  "Option named '%s' already contained in optionlist.", name);
+    {
+        if(debug > 0)
+            g_warning("Option %s already in optionlist\n", name);
+        ((Option*)element)->value = int_value;
+        ((Option*)element)->string_value = (string_value == NULL) ? NULL : g_strdup(string_value);
+        return;
+    }
+/* 	main_exit_program(EXIT_OPTION_NOT_FOUND,  */
+/* 			  "Option named '%s' already contained in optionlist.", name); */
 
     new.name = g_strdup(name);
     new.value = int_value;
diff --git a/src/start_end.c b/src/start_end.c
index 49a96e65..cbf3e2d0 100644
--- a/src/start_end.c
+++ b/src/start_end.c
@@ -190,6 +190,8 @@ start_new_season(void)
 	    if(cp(i).add_week == 0)
 		fixture_write_cup_fixtures(&cp(i));
 	}
+        /* Reset team pointers using the stored ids
+           (pointers might have changed because of prom/rel). */
 	else if(cp(i).add_week == -1)
 	{
 	    for(j=0;j<cp(i).fixtures->len;j++)
diff --git a/src/window.c b/src/window.c
index fa5defd8..5023ee3e 100644
--- a/src/window.c
+++ b/src/window.c
@@ -175,6 +175,9 @@ window_show_progress(gint pictype)
     gchar *buf2 = NULL;
     GtkImage *image = NULL;
 
+    if(sett_int("int_opt_goto_mode"))
+        return;
+
     window_create(WINDOW_PROGRESS);
 
     if(pictype == PIC_TYPE_NONE ||
diff --git a/src/youth_academy.c b/src/youth_academy.c
index 98a6d82e..45c6994c 100644
--- a/src/youth_academy.c
+++ b/src/youth_academy.c
@@ -209,14 +209,16 @@ youth_academy_update_weekly(void)
 	    if(g_array_index(ya->players, Player, j).age + 0.1 >
 	       const_float("float_player_age_lower") &&
 	       g_array_index(ya->players, Player, j).age + 0.08 <=
-	       const_float("float_player_age_lower"))
+	       const_float("float_player_age_lower") &&
+               !sett_int("int_opt_goto_mode"))
 		user_event_add(&usr(i), EVENT_TYPE_WARNING, -1, -1, NULL,
 			       _("Youth %s will be too old for the youth academy soon. Move him to your team or kick him out of the academy. Otherwise he'll probably look for another team to play in."), g_array_index(ya->players, Player, j).name);
 	    else if(g_array_index(ya->players, Player, j).age > const_float("float_player_age_lower"))
 	    {
-		user_event_add(&usr(i), EVENT_TYPE_WARNING, -1, -1, NULL,
-			       _("Youth %s thought he's old enough for a real contract and left your youth academy."),
-			       g_array_index(ya->players, Player, j).name);
+                if(!sett_int("int_opt_goto_mode"))
+                    user_event_add(&usr(i), EVENT_TYPE_WARNING, -1, -1, NULL,
+                                   _("Youth %s thought he's old enough for a real contract and left your youth academy."),
+                                   g_array_index(ya->players, Player, j).name);
 		free_player(&g_array_index(ya->players, Player, j));
 		g_array_remove_index(ya->players, j);
 	    }
@@ -245,10 +247,12 @@ youth_academy_update_weekly(void)
 		if(ya->players->len < const_int("int_youth_academy_max_youths"))
 		{
 		    youth_academy_add_new_player(ya);
-		    user_event_add(&usr(i), EVENT_TYPE_WARNING, -1, -1, NULL,
-				   _("A new youth registered at your youth academy."));
+
+                    if(!sett_int("int_opt_goto_mode"))
+                        user_event_add(&usr(i), EVENT_TYPE_WARNING, -1, -1, NULL,
+                                       _("A new youth registered at your youth academy."));
 		}
-		else
+		else if(!sett_int("int_opt_goto_mode"))
 		    user_event_add(&usr(i), EVENT_TYPE_WARNING, -1, -1, NULL,
 				   _("A new youth wanted to registered at your youth academy but there was no room for him."));
 	    }
diff --git a/support_files/definitions/miscellaneous/europe/cup_europe_champ_league.xml b/support_files/definitions/miscellaneous/europe/cup_europe_champ_league.xml
index c3f298ce..26b37d50 100644
--- a/support_files/definitions/miscellaneous/europe/cup_europe_champ_league.xml
+++ b/support_files/definitions/miscellaneous/europe/cup_europe_champ_league.xml
@@ -269,7 +269,7 @@
 	</choose_team>
 
 	<choose_team>
-	  <choose_team_sid>san_marino1</choose_team_sid>
+	  <choose_team_sid>san_marino_group_a san_marino_group_b</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
 	  <!--<start_idx>1</start_idx>-->
 	  <!--<end_idx>1</end_idx>-->
@@ -689,4 +689,4 @@
     <neutral>1</neutral>
     </cup_round>
   </cup_rounds>
-</cup>
\ No newline at end of file
+</cup>
diff --git a/support_files/definitions/miscellaneous/europe/cup_europe_champ_league1a.xml b/support_files/definitions/miscellaneous/europe/cup_europe_champ_league1a.xml
index b4c8638d..8ac4d189 100644
--- a/support_files/definitions/miscellaneous/europe/cup_europe_champ_league1a.xml
+++ b/support_files/definitions/miscellaneous/europe/cup_europe_champ_league1a.xml
@@ -262,7 +262,7 @@
         </choose_team>
 
         <choose_team>
-          <choose_team_sid>san_marino1</choose_team_sid>
+          <choose_team_sid>san_marino_group_a san_marino_group_b</choose_team_sid>
           <number_of_teams>1</number_of_teams>
           <!--<start_idx>1</start_idx>-->
           <!--<end_idx>1</end_idx>-->
@@ -688,4 +688,4 @@
     <neutral>1</neutral>
     </cup_round>
   </cup_rounds>
-</cup>
\ No newline at end of file
+</cup>
diff --git a/support_files/definitions/miscellaneous/europe/cup_europe_champ_league1b.xml b/support_files/definitions/miscellaneous/europe/cup_europe_champ_league1b.xml
index 65047fbc..79e910a7 100644
--- a/support_files/definitions/miscellaneous/europe/cup_europe_champ_league1b.xml
+++ b/support_files/definitions/miscellaneous/europe/cup_europe_champ_league1b.xml
@@ -262,7 +262,7 @@
 	</choose_team>
 
 	<choose_team>
-	  <choose_team_sid>san_marino1</choose_team_sid>
+	  <choose_team_sid>san_marino_group_a san_marino_group_b</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
 	  <!--<start_idx>1</start_idx>-->
 	  <!--<end_idx>1</end_idx>-->
@@ -688,4 +688,4 @@
     <neutral>1</neutral>
     </cup_round>
   </cup_rounds>
-</cup>
\ No newline at end of file
+</cup>
diff --git a/support_files/definitions/miscellaneous/europe/cup_europe_champ_league2.xml b/support_files/definitions/miscellaneous/europe/cup_europe_champ_league2.xml
index 79de6f11..a942199e 100644
--- a/support_files/definitions/miscellaneous/europe/cup_europe_champ_league2.xml
+++ b/support_files/definitions/miscellaneous/europe/cup_europe_champ_league2.xml
@@ -262,7 +262,7 @@
 	</choose_team>
 
 	<choose_team>
-	  <choose_team_sid>san_marino1</choose_team_sid>
+	  <choose_team_sid>san_marino_group_a san_marino_group_b</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
 	  <!--<start_idx>1</start_idx>-->
 	  <!--<end_idx>1</end_idx>-->
@@ -695,4 +695,4 @@
     <neutral>1</neutral>
     </cup_round>
   </cup_rounds>
-</cup>
\ No newline at end of file
+</cup>
diff --git a/support_files/definitions/miscellaneous/europe/cup_europe_champ_league2a.xml b/support_files/definitions/miscellaneous/europe/cup_europe_champ_league2a.xml
index efcd1af7..9fe9510a 100644
--- a/support_files/definitions/miscellaneous/europe/cup_europe_champ_league2a.xml
+++ b/support_files/definitions/miscellaneous/europe/cup_europe_champ_league2a.xml
@@ -262,7 +262,7 @@
 	</choose_team>
 
 	<choose_team>
-	  <choose_team_sid>san_marino1</choose_team_sid>
+	  <choose_team_sid>san_marino_group_a san_marino_group_b</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
 	  <!--<start_idx>1</start_idx>-->
 	  <!--<end_idx>1</end_idx>-->
@@ -695,4 +695,4 @@
     <neutral>1</neutral>
     </cup_round>
   </cup_rounds>
-</cup>
\ No newline at end of file
+</cup>
diff --git a/support_files/definitions/miscellaneous/europe/cup_europe_champ_league2s.xml b/support_files/definitions/miscellaneous/europe/cup_europe_champ_league2s.xml
index 7e25139d..c7bb5e92 100644
--- a/support_files/definitions/miscellaneous/europe/cup_europe_champ_league2s.xml
+++ b/support_files/definitions/miscellaneous/europe/cup_europe_champ_league2s.xml
@@ -262,7 +262,7 @@
 	</choose_team>
 
 	<choose_team>
-	  <choose_team_sid>san_marino1</choose_team_sid>
+	  <choose_team_sid>san_marino_group_a san_marino_group_b</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
 	  <!--<start_idx>1</start_idx>-->
 	  <!--<end_idx>1</end_idx>-->
@@ -695,4 +695,4 @@
     <neutral>1</neutral>
     </cup_round>
   </cup_rounds>
-</cup>
\ No newline at end of file
+</cup>
diff --git a/support_files/definitions/miscellaneous/europe/cup_europe_champ_league3.xml b/support_files/definitions/miscellaneous/europe/cup_europe_champ_league3.xml
index 83aa2a38..3c3b530a 100644
--- a/support_files/definitions/miscellaneous/europe/cup_europe_champ_league3.xml
+++ b/support_files/definitions/miscellaneous/europe/cup_europe_champ_league3.xml
@@ -262,7 +262,7 @@
 	</choose_team>
 
 	<choose_team>
-	  <choose_team_sid>san_marino1</choose_team_sid>
+	  <choose_team_sid>san_marino_group_a san_marino_group_b</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
 	  <!--<start_idx>1</start_idx>-->
 	  <!--<end_idx>1</end_idx>-->
@@ -695,4 +695,4 @@
     <neutral>1</neutral>
     </cup_round>
   </cup_rounds>
-</cup>
\ No newline at end of file
+</cup>
diff --git a/support_files/definitions/miscellaneous/europe/cup_europe_champ_league4.xml b/support_files/definitions/miscellaneous/europe/cup_europe_champ_league4.xml
index 276db970..27f5cc28 100644
--- a/support_files/definitions/miscellaneous/europe/cup_europe_champ_league4.xml
+++ b/support_files/definitions/miscellaneous/europe/cup_europe_champ_league4.xml
@@ -262,7 +262,7 @@
 	</choose_team>
 
 	<choose_team>
-	  <choose_team_sid>san_marino1</choose_team_sid>
+	  <choose_team_sid>san_marino_group_a san_marino_group_b</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
 	  <!--<start_idx>1</start_idx>-->
 	  <!--<end_idx>1</end_idx>-->
@@ -695,4 +695,4 @@
     <neutral>1</neutral>
     </cup_round>
   </cup_rounds>
-</cup>
\ No newline at end of file
+</cup>
diff --git a/support_files/definitions/miscellaneous/europe/cup_europe_uefa.xml b/support_files/definitions/miscellaneous/europe/cup_europe_uefa.xml
index fc03c2ba..1953eebc 100644
--- a/support_files/definitions/miscellaneous/europe/cup_europe_uefa.xml
+++ b/support_files/definitions/miscellaneous/europe/cup_europe_uefa.xml
@@ -392,8 +392,8 @@
           <choose_team_sid>switzerland1</choose_team_sid>
           <number_of_teams>1</number_of_teams>
           <!--here the representative of Liechtenstein, playing in the Swiss league since there's no national league in L. The id below points to its place in league_switzerland1 file among the ten teams.-->
-          <start_idx>10</start_idx>
-          <end_idx>10</end_idx>
+          <!--<start_idx>10</start_idx>-->
+          <!--<end_idx>10</end_idx>-->
           <randomly>1</randomly>
           <generate>1</generate>
         </choose_team>
@@ -656,7 +656,7 @@
         </choose_team>
 
         <choose_team>
-          <choose_team_sid>san_marino1</choose_team_sid>
+          <choose_team_sid>san_marino_group_a san_marino_group_b</choose_team_sid>
           #the national cup winner here. 
           <number_of_teams>1</number_of_teams>
           <!--<start_idx>2</start_idx>-->
@@ -686,7 +686,7 @@
 
         <choose_team>
           <!--this entry includes the 3 Fair Play winners awarded by the UEFA which begin in the first qualifying round. Since the criteria are impossible to implement here, the teams are drawn randomly-->
-          <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino1 serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
+          <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino_group_a san_marino_group_b serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
           <number_of_teams>3</number_of_teams>
           <randomly>1</randomly>
           <generate>1</generate>
@@ -854,7 +854,7 @@
 
         <choose_team>
           <!--this represents the 11 Intertoto Cup winners that enter the UEFA Cup in the 2nd qualifying round. As that cup isn't included in this game and would be hard to squeeze in or implement, the 11 winners are drawn randomly.-->
-          <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino1 serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
+          <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino_group_a san_marino_group_b serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
           <number_of_teams>11</number_of_teams>
           <randomly>1</randomly>
           <generate>1</generate>
@@ -1159,4 +1159,4 @@
       <neutral>1</neutral>
     </cup_round>
   </cup_rounds>
-</cup>
\ No newline at end of file
+</cup>
diff --git a/support_files/definitions/miscellaneous/europe/cup_europe_uefa1.xml b/support_files/definitions/miscellaneous/europe/cup_europe_uefa1.xml
index 1f7f688b..47313aa2 100644
--- a/support_files/definitions/miscellaneous/europe/cup_europe_uefa1.xml
+++ b/support_files/definitions/miscellaneous/europe/cup_europe_uefa1.xml
@@ -384,8 +384,8 @@
           <choose_team_sid>switzerland1</choose_team_sid>
           <number_of_teams>1</number_of_teams>
           <!--here the representative of Liechtenstein, playing in the Swiss league since there's no national league in L. The id below points to its place in league_switzerland1 file among the ten teams.-->
-          <start_idx>10</start_idx>
-          <end_idx>10</end_idx>
+          <!--<start_idx>10</start_idx>-->
+          <!--<end_idx>10</end_idx>-->
           <randomly>1</randomly>
           <generate>1</generate>
         </choose_team>
@@ -648,7 +648,7 @@
         </choose_team>
 
         <choose_team>
-          <choose_team_sid>san_marino1</choose_team_sid>
+          <choose_team_sid>san_marino_group_a san_marino_group_b</choose_team_sid>
           #the national cup winner here. 
           <number_of_teams>1</number_of_teams>
           <!--<start_idx>2</start_idx>-->
@@ -678,7 +678,7 @@
 
         <choose_team>
           <!--this entry includes the 3 Fair Play winners awarded by the UEFA which begin in the first qualifying round. Since the criteria are impossible to implement here, the teams are drawn randomly-->
-          <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino1 serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
+          <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino_group_a san_marino_group_b serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
           <number_of_teams>3</number_of_teams>
           <randomly>1</randomly>
           <generate>1</generate>
@@ -846,7 +846,7 @@
 
         <choose_team>
           <!--this represents the 11 Intertoto Cup winners that enter the UEFA Cup in the 2nd qualifying round. As that cup isn't included in this game and would be hard to squeeze in or implement, the 11 winners are drawn randomly.-->
-          <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino1 serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
+          <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino_group_a san_marino_group_b serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
           <number_of_teams>11</number_of_teams>
           <randomly>1</randomly>
           <generate>1</generate>
@@ -1151,4 +1151,4 @@
     <neutral>1</neutral>
     </cup_round>
   </cup_rounds>
-</cup>
\ No newline at end of file
+</cup>
diff --git a/support_files/definitions/miscellaneous/europe/cup_europe_uefa2a.xml b/support_files/definitions/miscellaneous/europe/cup_europe_uefa2a.xml
index f2fbf0ec..370235c7 100644
--- a/support_files/definitions/miscellaneous/europe/cup_europe_uefa2a.xml
+++ b/support_files/definitions/miscellaneous/europe/cup_europe_uefa2a.xml
@@ -378,8 +378,8 @@
 	 <choose_team_sid>switzerland1</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
 	  <!--here the representative of Liechtenstein, playing in the Swiss league since there's no national league in L. The id below points to its place in league_switzerland1 file among the ten teams.-->
-	  <start_idx>10</start_idx>
-	  <end_idx>10</end_idx>
+	  <!--<start_idx>10</start_idx>-->
+          <!--<end_idx>10</end_idx>-->
 	  <randomly>1</randomly>
 	  <generate>1</generate>
 	</choose_team>
@@ -642,7 +642,7 @@
 	</choose_team>
 
 	<choose_team>
-	  <choose_team_sid>san_marino1</choose_team_sid>
+	  <choose_team_sid>san_marino_group_a san_marino_group_b</choose_team_sid>
 	#the national cup winner here. 
 	  <number_of_teams>1</number_of_teams>
 	  <!--<start_idx>2</start_idx>-->
@@ -672,7 +672,7 @@
 
 	<choose_team>
 	 <!--this entry includes the 3 Fair Play winners awarded by the UEFA which begin in the first qualifying round. Since the criteria are impossible to implement here, the teams are drawn randomly-->
-	 <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino1 serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
+	 <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino_group_a san_marino_group_b serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
 	  <number_of_teams>3</number_of_teams>
 	  <randomly>1</randomly>
 	  <generate>1</generate>
@@ -846,7 +846,7 @@
 
 	<choose_team>
 	 <!--this represents the 11 Intertoto Cup winners that enter the UEFA Cup in the 2nd qualifying round. As that cup isn't included in this game and would be hard to squeeze in or implement, the 11 winners are drawn randomly.-->
-         <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino1 serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
+         <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino_group_a san_marino_group_b serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
 	  <number_of_teams>11</number_of_teams>
 	  <randomly>1</randomly>
 	  <generate>1</generate>
@@ -1157,4 +1157,4 @@
     <neutral>1</neutral>
     </cup_round>
   </cup_rounds>
-</cup>
\ No newline at end of file
+</cup>
diff --git a/support_files/definitions/miscellaneous/europe/cup_europe_uefa2g.xml b/support_files/definitions/miscellaneous/europe/cup_europe_uefa2g.xml
index fe204637..fe53d08a 100644
--- a/support_files/definitions/miscellaneous/europe/cup_europe_uefa2g.xml
+++ b/support_files/definitions/miscellaneous/europe/cup_europe_uefa2g.xml
@@ -378,8 +378,8 @@
 	 <choose_team_sid>switzerland1</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
 	  <!--here the representative of Liechtenstein, playing in the Swiss league since there's no national league in L. The id below points to its place in league_switzerland1 file among the ten teams.-->
-	  <start_idx>10</start_idx>
-	  <end_idx>10</end_idx>
+	  <!--<start_idx>10</start_idx>-->
+          <!--<end_idx>10</end_idx>-->
 	  <randomly>1</randomly>
 	  <generate>1</generate>
 	</choose_team>
@@ -642,7 +642,7 @@
 	</choose_team>
 
 	<choose_team>
-	  <choose_team_sid>san_marino1</choose_team_sid>
+	  <choose_team_sid>san_marino_group_a san_marino_group_b</choose_team_sid>
 	#the national cup winner here. 
 	  <number_of_teams>1</number_of_teams>
 	  <!--<start_idx>2</start_idx>-->
@@ -672,7 +672,7 @@
 
 	<choose_team>
 	 <!--this entry includes the 3 Fair Play winners awarded by the UEFA which begin in the first qualifying round. Since the criteria are impossible to implement here, the teams are drawn randomly-->
-	 <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino1 serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
+	 <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino_group_a san_marino_group_b serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
 	  <number_of_teams>3</number_of_teams>
 	  <randomly>1</randomly>
 	  <generate>1</generate>
@@ -853,7 +853,7 @@
 
 	<choose_team>
 	 <!--this represents the 11 Intertoto Cup winners that enter the UEFA Cup in the 2nd qualifying round. As that cup isn't included in this game and would be hard to squeeze in or implement, the 11 winners are drawn randomly.-->
-         <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino1 serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
+         <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino_group_a san_marino_group_b serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
 	  <number_of_teams>11</number_of_teams>
 	  <randomly>1</randomly>
 	  <generate>1</generate>
@@ -1158,4 +1158,4 @@
     <neutral>1</neutral>
     </cup_round>
   </cup_rounds>
-</cup>
\ No newline at end of file
+</cup>
diff --git a/support_files/definitions/miscellaneous/europe/cup_europe_uefa3a.xml b/support_files/definitions/miscellaneous/europe/cup_europe_uefa3a.xml
index 42b23a6f..82432b65 100644
--- a/support_files/definitions/miscellaneous/europe/cup_europe_uefa3a.xml
+++ b/support_files/definitions/miscellaneous/europe/cup_europe_uefa3a.xml
@@ -384,8 +384,8 @@
 	 <choose_team_sid>switzerland1</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
 	  <!--here the representative of Liechtenstein, playing in the Swiss league since there's no national league in L. The id below points to its place in league_switzerland1 file among the ten teams.-->
-	  <start_idx>10</start_idx>
-	  <end_idx>10</end_idx>
+	  <!--<start_idx>10</start_idx>-->
+          <!--<end_idx>10</end_idx>-->
 	  <randomly>1</randomly>
 	  <generate>1</generate>
 	</choose_team>
@@ -648,7 +648,7 @@
 	</choose_team>
 
 	<choose_team>
-	  <choose_team_sid>san_marino1</choose_team_sid>
+	  <choose_team_sid>san_marino_group_a san_marino_group_b</choose_team_sid>
 	#the national cup winner here. 
 	  <number_of_teams>1</number_of_teams>
 	  <!--<start_idx>2</start_idx>-->
@@ -678,7 +678,7 @@
 
 	<choose_team>
 	 <!--this entry includes the 3 Fair Play winners awarded by the UEFA which begin in the first qualifying round. Since the criteria are impossible to implement here, the teams are drawn randomly-->
-	 <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino1 serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
+	 <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino_group_a san_marino_group_b serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
 	  <number_of_teams>3</number_of_teams>
 	  <randomly>1</randomly>
 	  <generate>1</generate>
@@ -852,7 +852,7 @@
 
 	<choose_team>
 	 <!--this represents the 11 Intertoto Cup winners that enter the UEFA Cup in the 2nd qualifying round. As that cup isn't included in this game and would be hard to squeeze in or implement, the 11 winners are drawn randomly.-->
-         <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino1 serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
+         <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino_group_a san_marino_group_b serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
 	  <number_of_teams>11</number_of_teams>
 	  <randomly>1</randomly>
 	  <generate>1</generate>
@@ -1157,4 +1157,4 @@
     <neutral>1</neutral>
     </cup_round>
   </cup_rounds>
-</cup>
\ No newline at end of file
+</cup>
diff --git a/support_files/definitions/miscellaneous/europe/cup_europe_uefa3b.xml b/support_files/definitions/miscellaneous/europe/cup_europe_uefa3b.xml
index c1a101fe..1c91b284 100644
--- a/support_files/definitions/miscellaneous/europe/cup_europe_uefa3b.xml
+++ b/support_files/definitions/miscellaneous/europe/cup_europe_uefa3b.xml
@@ -384,8 +384,8 @@
 	 <choose_team_sid>switzerland1</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
 	  <!--here the representative of Liechtenstein, playing in the Swiss league since there's no national league in L. The id below points to its place in league_switzerland1 file among the ten teams.-->
-	  <start_idx>10</start_idx>
-	  <end_idx>10</end_idx>
+	  <!--<start_idx>10</start_idx>-->
+          <!--<end_idx>10</end_idx>-->
 	  <randomly>1</randomly>
 	  <generate>1</generate>
 	</choose_team>
@@ -648,7 +648,7 @@
 	</choose_team>
 
 	<choose_team>
-	  <choose_team_sid>san_marino1</choose_team_sid>
+	  <choose_team_sid>san_marino_group_a san_marino_group_b</choose_team_sid>
 	#the national cup winner here. 
 	  <number_of_teams>1</number_of_teams>
 	  <!--<start_idx>2</start_idx>-->
@@ -678,7 +678,7 @@
 
 	<choose_team>
 	 <!--this entry includes the 3 Fair Play winners awarded by the UEFA which begin in the first qualifying round. Since the criteria are impossible to implement here, the teams are drawn randomly-->
-	 <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino1 serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
+	 <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino_group_a san_marino_group_b serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
 	  <number_of_teams>3</number_of_teams>
 	  <randomly>1</randomly>
 	  <generate>1</generate>
@@ -859,7 +859,7 @@
 
 	<choose_team>
 	 <!--this represents the 11 Intertoto Cup winners that enter the UEFA Cup in the 2nd qualifying round. As that cup isn't included in this game and would be hard to squeeze in or implement, the 11 winners are drawn randomly.-->
-         <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino1 serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
+         <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino_group_a san_marino_group_b serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
 	  <number_of_teams>11</number_of_teams>
 	  <randomly>1</randomly>
 	  <generate>1</generate>
@@ -1164,4 +1164,4 @@
     <neutral>1</neutral>
     </cup_round>
   </cup_rounds>
-</cup>
\ No newline at end of file
+</cup>
diff --git a/support_files/definitions/miscellaneous/europe/cup_europe_uefa3d.xml b/support_files/definitions/miscellaneous/europe/cup_europe_uefa3d.xml
index f3a054df..6c53515c 100644
--- a/support_files/definitions/miscellaneous/europe/cup_europe_uefa3d.xml
+++ b/support_files/definitions/miscellaneous/europe/cup_europe_uefa3d.xml
@@ -391,8 +391,8 @@
 	 <choose_team_sid>switzerland1</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
 	  <!--here the representative of Liechtenstein, playing in the Swiss league since there's no national league in L. The id below points to its place in league_switzerland1 file among the ten teams.-->
-	  <start_idx>10</start_idx>
-	  <end_idx>10</end_idx>
+	  <!--<start_idx>10</start_idx>-->
+          <!--<end_idx>10</end_idx>-->
 	  <randomly>1</randomly>
 	  <generate>1</generate>
 	</choose_team>
@@ -655,7 +655,7 @@
 	</choose_team>
 
 	<choose_team>
-	  <choose_team_sid>san_marino1</choose_team_sid>
+	  <choose_team_sid>san_marino_group_a san_marino_group_b</choose_team_sid>
 	#the national cup winner here. 
 	  <number_of_teams>1</number_of_teams>
 	  <!--<start_idx>2</start_idx>-->
@@ -685,7 +685,7 @@
 
 	<choose_team>
 	 <!--this entry includes the 3 Fair Play winners awarded by the UEFA which begin in the first qualifying round. Since the criteria are impossible to implement here, the teams are drawn randomly-->
-	 <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino1 serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
+	 <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino_group_a san_marino_group_b serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
 	  <number_of_teams>3</number_of_teams>
 	  <randomly>1</randomly>
 	  <generate>1</generate>
@@ -853,7 +853,7 @@
 
 	<choose_team>
 	 <!--this represents the 11 Intertoto Cup winners that enter the UEFA Cup in the 2nd qualifying round. As that cup isn't included in this game and would be hard to squeeze in or implement, the 11 winners are drawn randomly.-->
-         <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino1 serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
+         <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino_group_a san_marino_group_b serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
 	  <number_of_teams>11</number_of_teams>
 	  <randomly>1</randomly>
 	  <generate>1</generate>
@@ -1158,4 +1158,4 @@
     <neutral>1</neutral>
     </cup_round>
   </cup_rounds>
-</cup>
\ No newline at end of file
+</cup>
diff --git a/support_files/definitions/miscellaneous/europe/cup_europe_uefa3e.xml b/support_files/definitions/miscellaneous/europe/cup_europe_uefa3e.xml
index 3ffea32d..f86d3689 100644
--- a/support_files/definitions/miscellaneous/europe/cup_europe_uefa3e.xml
+++ b/support_files/definitions/miscellaneous/europe/cup_europe_uefa3e.xml
@@ -378,8 +378,8 @@
 	 <choose_team_sid>switzerland1</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
 	  <!--here the representative of Liechtenstein, playing in the Swiss league since there's no national league in L. The id below points to its place in league_switzerland1 file among the ten teams.-->
-	  <start_idx>10</start_idx>
-	  <end_idx>10</end_idx>
+	  <!--<start_idx>10</start_idx>-->
+          <!--<end_idx>10</end_idx>-->
 	  <randomly>1</randomly>
 	  <generate>1</generate>
 	</choose_team>
@@ -642,7 +642,7 @@
 	</choose_team>
 
 	<choose_team>
-	  <choose_team_sid>san_marino1</choose_team_sid>
+	  <choose_team_sid>san_marino_group_a san_marino_group_b</choose_team_sid>
 	#the national cup winner here. 
 	  <number_of_teams>1</number_of_teams>
 	  <!--<start_idx>2</start_idx>-->
@@ -672,7 +672,7 @@
 
 	<choose_team>
 	 <!--this entry includes the 3 Fair Play winners awarded by the UEFA which begin in the first qualifying round. Since the criteria are impossible to implement here, the teams are drawn randomly-->
-	 <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino1 serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
+	 <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino_group_a san_marino_group_b serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
 	  <number_of_teams>3</number_of_teams>
 	  <randomly>1</randomly>
 	  <generate>1</generate>
@@ -840,7 +840,7 @@
 
 	<choose_team>
 	 <!--this represents the 11 Intertoto Cup winners that enter the UEFA Cup in the 2nd qualifying round. As that cup isn't included in this game and would be hard to squeeze in or implement, the 11 winners are drawn randomly.-->
-         <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino1 serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
+         <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino_group_a san_marino_group_b serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
 	  <number_of_teams>11</number_of_teams>
 	  <randomly>1</randomly>
 	  <generate>1</generate>
@@ -1165,4 +1165,4 @@
     <neutral>1</neutral>
     </cup_round>
   </cup_rounds>
-</cup>
\ No newline at end of file
+</cup>
diff --git a/support_files/definitions/miscellaneous/europe/cup_europe_uefa3f.xml b/support_files/definitions/miscellaneous/europe/cup_europe_uefa3f.xml
index 13b386f8..1c8a8c07 100644
--- a/support_files/definitions/miscellaneous/europe/cup_europe_uefa3f.xml
+++ b/support_files/definitions/miscellaneous/europe/cup_europe_uefa3f.xml
@@ -378,8 +378,8 @@
 	 <choose_team_sid>switzerland1</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
 	  <!--here the representative of Liechtenstein, playing in the Swiss league since there's no national league in L. The id below points to its place in league_switzerland1 file among the ten teams.-->
-	  <start_idx>10</start_idx>
-	  <end_idx>10</end_idx>
+	  <!--<start_idx>10</start_idx>-->
+          <!--<end_idx>10</end_idx>-->
 	  <randomly>1</randomly>
 	  <generate>1</generate>
 	</choose_team>
@@ -642,7 +642,7 @@
 	</choose_team>
 
 	<choose_team>
-	  <choose_team_sid>san_marino1</choose_team_sid>
+	  <choose_team_sid>san_marino_group_a san_marino_group_b</choose_team_sid>
 	#the national cup winner here. 
 	  <number_of_teams>1</number_of_teams>
 	  <!--<start_idx>2</start_idx>-->
@@ -672,7 +672,7 @@
 
 	<choose_team>
 	 <!--this entry includes the 3 Fair Play winners awarded by the UEFA which begin in the first qualifying round. Since the criteria are impossible to implement here, the teams are drawn randomly-->
-	 <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino1 serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
+	 <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino_group_a san_marino_group_b serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
 	  <number_of_teams>3</number_of_teams>
 	  <randomly>1</randomly>
 	  <generate>1</generate>
@@ -840,7 +840,7 @@
 
 	<choose_team>
 	 <!--this represents the 11 Intertoto Cup winners that enter the UEFA Cup in the 2nd qualifying round. As that cup isn't included in this game and would be hard to squeeze in or implement, the 11 winners are drawn randomly.-->
-         <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino1 serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
+         <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino_group_a san_marino_group_b serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
 	  <number_of_teams>11</number_of_teams>
 	  <randomly>1</randomly>
 	  <generate>1</generate>
@@ -1165,4 +1165,4 @@
     <neutral>1</neutral>
     </cup_round>
   </cup_rounds>
-</cup>
\ No newline at end of file
+</cup>
diff --git a/support_files/definitions/miscellaneous/europe/cup_europe_uefa3g.xml b/support_files/definitions/miscellaneous/europe/cup_europe_uefa3g.xml
index e8fc9c4e..b538d363 100644
--- a/support_files/definitions/miscellaneous/europe/cup_europe_uefa3g.xml
+++ b/support_files/definitions/miscellaneous/europe/cup_europe_uefa3g.xml
@@ -378,8 +378,8 @@
 	 <choose_team_sid>switzerland1</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
 	  <!--here the representative of Liechtenstein, playing in the Swiss league since there's no national league in L. The id below points to its place in league_switzerland1 file among the ten teams.-->
-	  <start_idx>10</start_idx>
-	  <end_idx>10</end_idx>
+	  <!--<start_idx>10</start_idx>-->
+          <!--<end_idx>10</end_idx>-->
 	  <randomly>1</randomly>
 	  <generate>1</generate>
 	</choose_team>
@@ -642,7 +642,7 @@
 	</choose_team>
 
 	<choose_team>
-	  <choose_team_sid>san_marino1</choose_team_sid>
+	  <choose_team_sid>san_marino_group_a san_marino_group_b</choose_team_sid>
 	#the national cup winner here. 
 	  <number_of_teams>1</number_of_teams>
 	  <!--<start_idx>2</start_idx>-->
@@ -672,7 +672,7 @@
 
 	<choose_team>
 	 <!--this entry includes the 3 Fair Play winners awarded by the UEFA which begin in the first qualifying round. Since the criteria are impossible to implement here, the teams are drawn randomly-->
-	 <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino1serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
+	 <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino_group_a san_marino_group_bserbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
 	  <number_of_teams>3</number_of_teams>
 	  <randomly>1</randomly>
 	  <generate>1</generate>
@@ -840,7 +840,7 @@
 
 	<choose_team>
 	 <!--this represents the 11 Intertoto Cup winners that enter the UEFA Cup in the 2nd qualifying round. As that cup isn't included in this game and would be hard to squeeze in or implement, the 11 winners are drawn randomly.-->
-         <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino1 serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
+         <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino_group_a san_marino_group_b serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
 	  <number_of_teams>11</number_of_teams>
 	  <randomly>1</randomly>
 	  <generate>1</generate>
@@ -1158,4 +1158,4 @@
     <neutral>1</neutral>
     </cup_round>
   </cup_rounds>
-</cup>
\ No newline at end of file
+</cup>
diff --git a/support_files/definitions/miscellaneous/europe/cup_europe_uefa3i.xml b/support_files/definitions/miscellaneous/europe/cup_europe_uefa3i.xml
index 94c05b0d..a4ce5a97 100644
--- a/support_files/definitions/miscellaneous/europe/cup_europe_uefa3i.xml
+++ b/support_files/definitions/miscellaneous/europe/cup_europe_uefa3i.xml
@@ -378,8 +378,8 @@
           <choose_team_sid>switzerland1</choose_team_sid>
           <number_of_teams>1</number_of_teams>
           <!--here the representative of Liechtenstein, playing in the Swiss league since there's no national league in L. The id below points to its place in league_switzerland1 file among the ten teams.-->
-          <start_idx>10</start_idx>
-          <end_idx>10</end_idx>
+          <!--<start_idx>10</start_idx>-->
+          <!--<end_idx>10</end_idx>-->
           <randomly>1</randomly>
           <generate>1</generate>
         </choose_team>
@@ -642,7 +642,7 @@
         </choose_team>
 
         <choose_team>
-          <choose_team_sid>san_marino1</choose_team_sid>
+          <choose_team_sid>san_marino_group_a san_marino_group_b</choose_team_sid>
           #the national cup winner here. 
           <number_of_teams>1</number_of_teams>
           <!--<start_idx>2</start_idx>-->
@@ -672,7 +672,7 @@
 
         <choose_team>
           <!--this entry includes the 3 Fair Play winners awarded by the UEFA which begin in the first qualifying round. Since the criteria are impossible to implement here, the teams are drawn randomly-->
-          <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino1 serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
+          <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino_group_a san_marino_group_b serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
           <number_of_teams>3</number_of_teams>
           <randomly>1</randomly>
           <generate>1</generate>
@@ -839,7 +839,7 @@
 
         <choose_team>
           <!--this represents the 11 Intertoto Cup winners that enter the UEFA Cup in the 2nd qualifying round. As that cup isn't included in this game and would be hard to squeeze in or implement, the 11 winners are drawn randomly.-->
-          <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino1 serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
+          <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino_group_a san_marino_group_b serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
           <number_of_teams>11</number_of_teams>
           <randomly>1</randomly>
           <generate>1</generate>
@@ -1157,4 +1157,4 @@
     <neutral>1</neutral>
     </cup_round>
   </cup_rounds>
-</cup>
\ No newline at end of file
+</cup>
diff --git a/support_files/definitions/miscellaneous/europe/cup_europe_uefa4.xml b/support_files/definitions/miscellaneous/europe/cup_europe_uefa4.xml
index 2996e857..2f03cf9d 100644
--- a/support_files/definitions/miscellaneous/europe/cup_europe_uefa4.xml
+++ b/support_files/definitions/miscellaneous/europe/cup_europe_uefa4.xml
@@ -378,8 +378,8 @@
 	 <choose_team_sid>switzerland1</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
 	  <!--here the representative of Liechtenstein, playing in the Swiss league since there's no national league in L. The id below points to its place in league_switzerland1 file among the ten teams.-->
-	  <start_idx>10</start_idx>
-	  <end_idx>10</end_idx>
+	  <!--<start_idx>10</start_idx>-->
+          <!--<end_idx>10</end_idx>-->
 	  <randomly>1</randomly>
 	  <generate>1</generate>
 	</choose_team>
@@ -642,7 +642,7 @@
 	</choose_team>
 
 	<choose_team>
-	  <choose_team_sid>san_marino1</choose_team_sid>
+	  <choose_team_sid>san_marino_group_a san_marino_group_b</choose_team_sid>
 	#the national cup winner here. 
 	  <number_of_teams>1</number_of_teams>
 	  <!--<start_idx>2</start_idx>-->
@@ -672,7 +672,7 @@
 
 	<choose_team>
 	 <!--this entry includes the 3 Fair Play winners awarded by the UEFA which begin in the first qualifying round. Since the criteria are impossible to implement here, the teams are drawn randomly-->
-	 <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino1 serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
+	 <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino_group_a san_marino_group_b serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
 	  <number_of_teams>3</number_of_teams>
 	  <randomly>1</randomly>
 	  <generate>1</generate>
@@ -840,7 +840,7 @@
 
 	<choose_team>
 	 <!--this represents the 11 Intertoto Cup winners that enter the UEFA Cup in the 2nd qualifying round. As that cup isn't included in this game and would be hard to squeeze in or implement, the 11 winners are drawn randomly.-->
-         <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino1 serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
+         <choose_team_sid>albania1 andorra1 armenia1 austria1 azerbaijan1 belarus1 belgium1 bosnia_herzegovina1 bulgaria1 croatia1 cyprus1 czech1 denmark1 england1 estonia1 faroe_islands1 finland1 france1 fyr_macedonia1 georgia1 germany1 greece1 hungary1 iceland1 ireland1 israel1 italy1 kazakhstan1 latvia1 lithuania1 luxembourg1 malta1 moldova1 montenegro1 netherlands1 n_ireland1 norway1 poland1 portugal1 romania1 russia1 san_marino_group_a san_marino_group_b serbia1 scotland1 slovakia1 slovenia1 spain1 sweden_allsvenskan switzerland1 turkey1 ukraine1 wales1</choose_team_sid>
 	  <number_of_teams>11</number_of_teams>
 	  <randomly>1</randomly>
 	  <generate>1</generate>
@@ -1158,4 +1158,4 @@
     <neutral>1</neutral>
     </cup_round>
   </cup_rounds>
-</cup>
\ No newline at end of file
+</cup>