diff --git a/Start_Windows/game.c b/Start_Windows/game.c
index e08e01d..808b89f 100644
--- a/Start_Windows/game.c
+++ b/Start_Windows/game.c
@@ -17,58 +17,23 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
 {
    srand(time(NULL));
    
-      int value = (rand*rand) / rand;
-
-      if(rand < 0) //wenn rand eine negative Zahl ist, soll das Wort horizontal platziert werden
-      {
-         for(int j = 0; j < MAX_SEARCH_FIELD_LEN; j++) // geht salad durch
-         {
-            if(salad[j][i] == NULL) //sucht horizontal nach einer freien Zeile in salad
-            {
-               for(int h = 0; h < MAX_SEARCH_FIELD_LEN; h++) //kopiert die Zeichen in word in die Zeile in salad
-               {
-                  salad[j][h] = word[value][h]; //value ist der Wert des zufaelligen Wortes, also der Platz im word Array
-               }
-            }
-         }
-      }
-      else  //vertikal platzieren 
-      {
-         for(int j = 0; j < MAX_SEARCH_FIELD_LEN; j++) // geht salad durch
-         {
-            if(salad[i][j] == NULL) //sucht vertikal nach einer freien Zeile in salad
-            {
-               for(int h = 0; h < MAX_SEARCH_FIELD_LEN; h++) //kopiert die Zeichen in word in die Spalte in salad
-               {
-                  salad[h][j] = word[value][h]; //value ist der Wert des zufaelligen Wortes, also der Platz im word Array
-               }
-            }
-         }
-      }
-   }
-   //jetzt ist die Wortliste leer oder es wurden alle Worte in Salad geschrieben. 
-   
-   //Restliche Plaetze mit random Buchstaben fuellen: 
-   int num = rand()%(26 - 1 + 1) - 1;
-   char letter = 64 + num;  
-
-   for(int i = 0; i < MAX_SEARCH_FIELD_LEN; i++)
-   {
-      for(int j = 0; j < MAX_SEARCH_FIELD_LEN; j++)
-      {
-         if(salad[i][j] == NULL)
-         {
-            salad[i][j] = letter;
-         }
-      }
-   }
-
+   fillSalad(salad, searchFieldLen, words, wordCount);
+   showWordSalad(salad, searchFieldLen);
+   return 1;
 }
 
 // Prints the word salad to console
 void showWordSalad(const char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen)
 {
-
+   printf("\nWordSalad:\n");
+   for(int i=0; i < MAX_SEARCH_FIELD_LEN; i++)
+   {
+      for(int j=0; j< MAX_SEARCH_FIELD_LEN; j++)
+      {
+         printf("%c\t", salad[i][j]);
+      }
+   printf("\n");
+   }
 }
 
 // Decides wether to print horizontally or vertically
@@ -107,7 +72,12 @@ void fillSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned
             if(salad[j][0] == NULL) 
             {
                int numWord = whichWord(words, wordCount);   //determines, which word will be written in salad
+               if(numWord != -5){
                fillWordinRow(salad, searchFieldLen, words, wordCount, numWord, j); // fills word horizontally in salad and deletes the word afterwards
+               }
+               else{
+                  fillRandom(salad, searchFieldLen, words, wordCount, emptyPlaces(wordCount));
+               }
             }
          }
       }
@@ -117,7 +87,12 @@ void fillSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned
             if(salad[0][j] == NULL)
             {
                int numWord = whichWord(words, wordCount);
+               if(numWord != -5){
                fillWordinColumn(salad, searchFieldLen, words, wordCount, numWord, j);
+               }
+               else{
+                  fillRandom(salad, searchFieldLen, words, wordCount, emptyPlaces(wordCount));
+               }
             }
          }
       }
@@ -127,12 +102,13 @@ void fillSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned
 // Determines, which word from words is filled into salad
 int whichWord(const char words[][MAX_WORD_LEN], unsigned int wordCount)
 {
-   while(true){
+   for(int i = 0; i< MAX_NUMBERS_OF_WORDS; i++){
    int numWord = rand()% (wordCount + 1);
    if(words[numWord][0] != NULL)
    {
       return numWord; //return random row, which has not been used yet
    }
+   return -5;
    }
 
 }
@@ -140,7 +116,7 @@ int whichWord(const char words[][MAX_WORD_LEN], unsigned int wordCount)
 //Fills word in salad and deletes row of words of the used word
 void fillWordinRow(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen, const char words[][MAX_WORD_LEN], unsigned int wordCount, int numWord, int row)
 {
-
+   
    for(int h = 0; h < MAX_SEARCH_FIELD_LEN; h++)
    {
       for(int g = 0; g < MAX_WORD_LEN; g++)
@@ -165,7 +141,21 @@ void fillWordinColumn(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], un
    }
 }
 // if emptyPlaces, fill these with random letters
-void fillRandom()
+void fillRandom(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen, const char words[][MAX_WORD_LEN], unsigned int wordCount, int empty)
 {
-
+   if(empty)
+   {
+      for(int j=0; j < MAX_SEARCH_FIELD_LEN; j++)
+      {
+         for(int h= 0; h < MAX_SEARCH_FIELD_LEN; h++)
+         {
+            if(salad[j][h] == NULL)
+            {
+               int num = rand()%(26 - 1 + 1) - 1;
+               char letter = 64 + num;  
+               salad[j][h] = letter;
+            }
+         }
+      }
+   }
 }
\ No newline at end of file
diff --git a/Start_Windows/game.h b/Start_Windows/game.h
index 95346af..0fb66a1 100644
--- a/Start_Windows/game.h
+++ b/Start_Windows/game.h
@@ -7,5 +7,14 @@
 
 int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen, const char words[][MAX_WORD_LEN], unsigned int wordCount);
 void showWordSalad(const char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen);
+int printHorizontal(unsigned int wordCount);
+int emptyPlaces(unsigned int wordCount);
+void fillSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen, const char words[][MAX_WORD_LEN], unsigned int wordCount);
+int whichWord(const char words[][MAX_WORD_LEN], unsigned int wordCount);
+void fillWordinRow(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen, const char words[][MAX_WORD_LEN], unsigned int wordCount, int numWord, int row);
+void fillWordinColumn(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen, const char words[][MAX_WORD_LEN], unsigned int wordCount, int numWord, int column);
+void fillRandom(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsigned int searchFieldLen, const char words[][MAX_WORD_LEN], unsigned int wordCount, int empty);
+
+
 
 #endif