diff --git a/Output/PartyModes/Challenge.xml b/Output/PartyModes/Challenge.xml
index 9310ccc9..c5fe5c94 100644
--- a/Output/PartyModes/Challenge.xml
+++ b/Output/PartyModes/Challenge.xml
@@ -9,6 +9,7 @@
 	<PartyModeFile>PartyModeChallenge</PartyModeFile>
     <PartyModeVersionMajor>0</PartyModeVersionMajor>
     <PartyModeVersionMinor>1</PartyModeVersionMinor>
+	<TargetAudience>TR_PARTYMODE_AUDIENCE</TargetAudience>
   </Info>
   <PartyScreens>
     <ScreenFile>PartyScreenChallengeMain</ScreenFile>
diff --git a/Output/PartyModes/Challenge/Code/PartyModeChallenge.cs b/Output/PartyModes/Challenge/Code/PartyModeChallenge.cs
index 1ca2cd5b..39bcab12 100644
--- a/Output/PartyModes/Challenge/Code/PartyModeChallenge.cs
+++ b/Output/PartyModes/Challenge/Code/PartyModeChallenge.cs
@@ -8,6 +8,12 @@ namespace Vocaluxe.PartyModes
 {
     public class PartyModeChallenge : CPartyMode
     {
+        private const int MaxPlayer = 10;
+        private const int MinPlayer = 2;
+        private const int MaxTeams = 0;
+        private const int MinTeams = 0;
+
+
         public PartyModeChallenge()
         {
             _ScreenSongOptions.Selection.RandomOnly = false;
@@ -41,5 +47,25 @@ namespace Vocaluxe.PartyModes
             _ScreenSongOptions.Sorting.SearchStringVisible = Visible;
         }
 
+        public override int GetMaxPlayer()
+        {
+            return MaxPlayer;
+        }
+
+        public override int GetMinPlayer()
+        {
+            return MinPlayer;
+        }
+
+        public override int GetMaxTeams()
+        {
+            return MaxTeams;
+        }
+
+        public override int GetMinTeams()
+        {
+            return MinTeams;
+        }
+
     }
 }
\ No newline at end of file
diff --git a/Output/PartyModes/Challenge/Languages/Deutsch.xml b/Output/PartyModes/Challenge/Languages/Deutsch.xml
index adb40cfe..4c5bad10 100644
--- a/Output/PartyModes/Challenge/Languages/Deutsch.xml
+++ b/Output/PartyModes/Challenge/Languages/Deutsch.xml
@@ -7,6 +7,7 @@
 		<!--General-->
 		<TR_PARTYMODE_NAME>Challenge Modus</TR_PARTYMODE_NAME>
 		<TR_PARTYMODE_DESCRIPTION>Spiele mit bis zu X Spielern einen Wettkampfmodus</TR_PARTYMODE_DESCRIPTION>
+		<TR_PARTYMODE_AUDIENCE>Für alle, die Spaß am Wettkampf haben.</TR_PARTYMODE_AUDIENCE>
 		<TR_BUTTON_NEXT>Weiter</TR_BUTTON_NEXT>
 		<TR_BUTTON_BACK>Zurück</TR_BUTTON_BACK>
 		<TR_BUTTON_START>Start</TR_BUTTON_START>
diff --git a/Output/PartyModes/Challenge/Languages/English.xml b/Output/PartyModes/Challenge/Languages/English.xml
index 18a6c856..9674208c 100644
--- a/Output/PartyModes/Challenge/Languages/English.xml
+++ b/Output/PartyModes/Challenge/Languages/English.xml
@@ -7,6 +7,7 @@
 		<!--General-->
 		<TR_PARTYMODE_NAME>Challenge Mode</TR_PARTYMODE_NAME>
 		<TR_PARTYMODE_DESCRIPTION>Challenge with up to X Players</TR_PARTYMODE_DESCRIPTION>
+		<TR_PARTYMODE_AUDIENCE>For all who are interested in duel fights.</TR_PARTYMODE_AUDIENCE>
 		<TR_BUTTON_NEXT>Next</TR_BUTTON_NEXT>
 		<TR_BUTTON_BACK>Back</TR_BUTTON_BACK>
 		<TR_BUTTON_START>Start</TR_BUTTON_START>
diff --git a/Output/PartyModes/Challenge/Languages/French.xml b/Output/PartyModes/Challenge/Languages/French.xml
index 19a27703..7e0de971 100644
--- a/Output/PartyModes/Challenge/Languages/French.xml
+++ b/Output/PartyModes/Challenge/Languages/French.xml
@@ -7,6 +7,7 @@
 		<!--General-->
 		<TR_PARTYMODE_NAME>TODO: Challenge Mode</TR_PARTYMODE_NAME>
 		<TR_PARTYMODE_DESCRIPTION>TODO: Challenge with up to X Players</TR_PARTYMODE_DESCRIPTION>
+		<TR_PARTYMODE_AUDIENCE>TODO: For all who are interested in duel fights.</TR_PARTYMODE_AUDIENCE>
 		<TR_BUTTON_NEXT>TODO: Next</TR_BUTTON_NEXT>
 		<TR_BUTTON_BACK>Retour</TR_BUTTON_BACK>
 		<TR_BUTTON_START>Démarrer</TR_BUTTON_START>
diff --git a/Output/PartyModes/Challenge/Languages/Spanish.xml b/Output/PartyModes/Challenge/Languages/Spanish.xml
index 2c319ab5..0486ae57 100644
--- a/Output/PartyModes/Challenge/Languages/Spanish.xml
+++ b/Output/PartyModes/Challenge/Languages/Spanish.xml
@@ -7,6 +7,7 @@
 		<!--General-->
 		<TR_PARTYMODE_NAME>TODO: Challenge Mode</TR_PARTYMODE_NAME>
 		<TR_PARTYMODE_DESCRIPTION>TODO: Challenge with up to X Players</TR_PARTYMODE_DESCRIPTION>
+		<TR_PARTYMODE_AUDIENCE>TODO: For all who are interested in duel fights.</TR_PARTYMODE_AUDIENCE>
 		<TR_BUTTON_NEXT>TODO: Next</TR_BUTTON_NEXT>
 		<TR_BUTTON_BACK>Volver</TR_BUTTON_BACK>
 		<TR_BUTTON_START>Comenzar</TR_BUTTON_START>
diff --git a/PartyModeChallenge/PartyModeChallenge.cs b/PartyModeChallenge/PartyModeChallenge.cs
index 1ca2cd5b..39bcab12 100644
--- a/PartyModeChallenge/PartyModeChallenge.cs
+++ b/PartyModeChallenge/PartyModeChallenge.cs
@@ -8,6 +8,12 @@ namespace Vocaluxe.PartyModes
 {
     public class PartyModeChallenge : CPartyMode
     {
+        private const int MaxPlayer = 10;
+        private const int MinPlayer = 2;
+        private const int MaxTeams = 0;
+        private const int MinTeams = 0;
+
+
         public PartyModeChallenge()
         {
             _ScreenSongOptions.Selection.RandomOnly = false;
@@ -41,5 +47,25 @@ namespace Vocaluxe.PartyModes
             _ScreenSongOptions.Sorting.SearchStringVisible = Visible;
         }
 
+        public override int GetMaxPlayer()
+        {
+            return MaxPlayer;
+        }
+
+        public override int GetMinPlayer()
+        {
+            return MinPlayer;
+        }
+
+        public override int GetMaxTeams()
+        {
+            return MaxTeams;
+        }
+
+        public override int GetMinTeams()
+        {
+            return MinTeams;
+        }
+
     }
 }
\ No newline at end of file
diff --git a/Vocaluxe/Base/CParty.cs b/Vocaluxe/Base/CParty.cs
index ef0333c3..ca16a6d9 100644
--- a/Vocaluxe/Base/CParty.cs
+++ b/Vocaluxe/Base/CParty.cs
@@ -25,6 +25,7 @@ namespace Vocaluxe.Base
         public List<string> ScreenFiles;
         public int PartyModeVersionMajor;
         public int PartyModeVersionMinor;
+        public string TargetAudience;
         public bool NoErrors;
         public IPartyMode PartyMode;
     }
@@ -108,11 +109,11 @@ namespace Vocaluxe.Base
                         info.VersionMajor = mode.PartyModeVersionMajor;
                         info.VersionMinor = mode.PartyModeVersionMinor;
 
-                        info.TargetAudience = "TODO";
-                        info.MaxPlayers = 100;
-                        info.MinPlayers = 2;
-                        info.MaxTeams = 30;
-                        info.MinTeams = 1;
+                        info.TargetAudience = mode.TargetAudience;
+                        info.MaxPlayers = mode.PartyMode.GetMaxPlayer();
+                        info.MinPlayers = mode.PartyMode.GetMinPlayer();
+                        info.MaxTeams = mode.PartyMode.GetMaxTeams();
+                        info.MinTeams = mode.PartyMode.GetMinTeams();
 
                         infos.Add(info);
                     }
@@ -225,6 +226,7 @@ namespace Vocaluxe.Base
                 loaded &= CHelper.GetInnerValuesFromXML("PartyScreens", navigator, ref pm.ScreenFiles);
                 loaded &= CHelper.TryGetIntValueFromXML("//root/Info/PartyModeVersionMajor", navigator, ref pm.PartyModeVersionMajor);
                 loaded &= CHelper.TryGetIntValueFromXML("//root/Info/PartyModeVersionMinor", navigator, ref pm.PartyModeVersionMinor);
+                loaded &= CHelper.GetValueFromXML("//root/Info/TargetAudience", navigator, ref pm.TargetAudience, "ERROR TargetAudience");
 
                 if (pm.PartyModeSystemVersion != PartyModeSystemVersion)
                 {
diff --git a/VocaluxeLib/PartyModes/CPartyMode.cs b/VocaluxeLib/PartyModes/CPartyMode.cs
index d81b2d67..618a191b 100644
--- a/VocaluxeLib/PartyModes/CPartyMode.cs
+++ b/VocaluxeLib/PartyModes/CPartyMode.cs
@@ -64,6 +64,26 @@ namespace Vocaluxe.PartyModes
             return new ScreenSongOptions();
         }
 
+        public virtual int GetMaxPlayer()
+        {
+            return 6;
+        }
+
+        public virtual int GetMinPlayer()
+        {
+            return 1;
+        }
+
+        public virtual int GetMaxTeams()
+        {
+            return 0;
+        }
+
+        public virtual int GetMinTeams()
+        {
+            return 0;
+        }
+
         public virtual void SetSearchString(string SearchString, bool Visible)
         {
         }
diff --git a/VocaluxeLib/PartyModes/IPartyMode.cs b/VocaluxeLib/PartyModes/IPartyMode.cs
index 40d37bd3..e2b427c8 100644
--- a/VocaluxeLib/PartyModes/IPartyMode.cs
+++ b/VocaluxeLib/PartyModes/IPartyMode.cs
@@ -61,6 +61,11 @@ namespace Vocaluxe.PartyModes
         EScreens GetMainScreen();
         ScreenSongOptions GetScreenSongOptions();
 
+        int GetMaxPlayer();
+        int GetMinPlayer();
+        int GetMaxTeams();
+        int GetMinTeams();        
+
         void SetSearchString(string SearchString, bool Visible);
 
         void JokerUsed(int TeamNr);