diff --git a/support_files/definitions/europe/moldova/cup_moldova_cup.xml b/support_files/definitions/europe/moldova/cup_moldova_cup.xml
index efa53147..1afc0cb7 100644
--- a/support_files/definitions/europe/moldova/cup_moldova_cup.xml
+++ b/support_files/definitions/europe/moldova/cup_moldova_cup.xml
@@ -4,7 +4,7 @@
   <short_name>CupaRM</short_name>
   <symbol>flag_moldova.png</symbol>
   <sid>moldova_cup</sid>
-  <last_week>31</last_week>
+  <last_week>45</last_week>
   <week_gap>3</week_gap>
   <property>national</property>
 
@@ -38,7 +38,7 @@
         </choose_team>
       </choose_teams>
       <byes>2</byes>
-      <delay>-6</delay>
+      <delay>-12</delay>
     </cup_round>
 
     <cup_round>
@@ -54,7 +54,7 @@
         </choose_team>
       </choose_teams>
       <byes>0</byes>
-      <delay>-3</delay>
+      <delay>-13</delay>
     </cup_round>
 
     <cup_round>
@@ -69,10 +69,11 @@
 	  <randomly>1</randomly>
         </choose_team>
       </choose_teams>
-      <delay>-3</delay>
+      <delay>-13</delay>
     </cup_round>
 
     <cup_round>
+      <delay>-14</delay>
     </cup_round>
 
     <cup_round>
diff --git a/support_files/definitions/europe/moldova/league_moldova1.xml b/support_files/definitions/europe/moldova/league_moldova1.xml
index e4e62926..c16a371c 100644
--- a/support_files/definitions/europe/moldova/league_moldova1.xml
+++ b/support_files/definitions/europe/moldova/league_moldova1.xml
@@ -6,10 +6,17 @@
   <symbol>flag_moldova.png</symbol>
   <first_week>1</first_week>
   <week_gap>1</week_gap>
+  <break_in length="1">10</break_in>
+  <break_in length="1">15</break_in>
+  <break_in length="14">22</break_in>
   <average_talent>6000</average_talent>
   <names_file>romania</names_file>
   <round_robins>3</round_robins>
   <yellow_red>5</yellow_red>
+  <two_match_week_start>2</two_match_week_start> 
+  <two_match_week_end>3</two_match_week_end>
+  <two_match_week_start>10</two_match_week_start> 
+  <two_match_week_end>11</two_match_week_end>
 
   <prom_rel>
     <prom_rel_element>
@@ -55,4 +62,4 @@
       <team_name>Z. Chişinău</team_name>
     </team>
    </teams>
-</league>
+</league>
\ No newline at end of file
diff --git a/support_files/definitions/europe/moldova/league_moldova2.xml b/support_files/definitions/europe/moldova/league_moldova2.xml
index 67d19b95..cc632f40 100644
--- a/support_files/definitions/europe/moldova/league_moldova2.xml
+++ b/support_files/definitions/europe/moldova/league_moldova2.xml
@@ -6,6 +6,9 @@
   <symbol>flag_moldova.png</symbol>
   <first_week>1</first_week>
   <week_gap>1</week_gap>
+  <break_in length="1">10</break_in>
+  <break_in length="1">15</break_in>
+  <break_in length="14">22</break_in>
   <average_talent>5400</average_talent>
   <names_file>romania</names_file>
   <yellow_red>5</yellow_red>
@@ -17,13 +20,6 @@
       <dest_sid>moldova1</dest_sid>
       <prom_rel_type>promotion</prom_rel_type>
     </prom_rel_element>
-
-    <prom_rel_element>
-      <rank_start>15</rank_start>
-      <rank_end>16</rank_end>
-      <dest_sid>moldova3a moldova3b</dest_sid>
-      <prom_rel_type>relegation</prom_rel_type>
-    </prom_rel_element>
   </prom_rel>
 
   <teams>
diff --git a/support_files/definitions/europe/moldova/league_moldova3a.xml b/support_files/definitions/europe/moldova/league_moldova3a.xml
index 255828a0..d065faa1 100644
--- a/support_files/definitions/europe/moldova/league_moldova3a.xml
+++ b/support_files/definitions/europe/moldova/league_moldova3a.xml
@@ -9,15 +9,7 @@
   <average_talent>4900</average_talent>
   <names_file>romania</names_file>
   <layer>3</layer>
-
-  <prom_rel>
-    <prom_rel_element>
-      <rank_start>1</rank_start>
-      <rank_end>1</rank_end>
-      <dest_sid>moldova2</dest_sid>
-      <prom_rel_type>promotion</prom_rel_type>
-    </prom_rel_element>
-  </prom_rel>
+  <property>inactive</property>
 
   <teams>
     <team>
diff --git a/support_files/definitions/europe/moldova/league_moldova3b.xml b/support_files/definitions/europe/moldova/league_moldova3b.xml
index 0600fc4f..8046b6c2 100644
--- a/support_files/definitions/europe/moldova/league_moldova3b.xml
+++ b/support_files/definitions/europe/moldova/league_moldova3b.xml
@@ -9,15 +9,7 @@
   <average_talent>4900</average_talent>
   <names_file>romania</names_file>
   <layer>3</layer>
-
-  <prom_rel>
-    <prom_rel_element>
-      <rank_start>1</rank_start>
-      <rank_end>1</rank_end>
-      <dest_sid>moldova2</dest_sid>
-      <prom_rel_type>promotion</prom_rel_type>
-    </prom_rel_element>
-  </prom_rel>
+  <property>inactive</property>
 
   <teams>
     <team>