diff --git a/worlds/yachtdice/Options.py b/worlds/yachtdice/Options.py
index 9fd47ce314..a351da45ee 100644
--- a/worlds/yachtdice/Options.py
+++ b/worlds/yachtdice/Options.py
@@ -82,13 +82,14 @@ class gameDifficulty(Choice):
     Easy: for beginners. No luck required, just roll the dice and have fun. Lower final goal.
     Medium: intended difficulty. If you play smart, you'll finish the game without any trouble.
     Hard: you may need to play smart, be lucky and understand the score multiplier mechanic. Higher final goal.
-    Extreme: more strict logic, higher final goal. NOT RECOMMENDED FOR MULTIWORLDS.
+    Extreme: more strict logic, higher final goal. ONLY FOR EXPERIENCES PLAYERS IN MULTIWORLDS.
     """
     display_name = "Game difficulty"
     option_easy = 1
     option_medium = 2
     option_hard = 3
     option_extreme = 4
+    #option_nightmare = 5
     
     default = 2
     
diff --git a/worlds/yachtdice/Rules.py b/worlds/yachtdice/Rules.py
index 3a19877100..3807e2116d 100644
--- a/worlds/yachtdice/Rules.py
+++ b/worlds/yachtdice/Rules.py
@@ -49,9 +49,9 @@ category_mappings = {
 
 
 class Category:
-    def __init__(self, name, mult = 1):
+    def __init__(self, name, quantity = 1):
         self.name = name
-        self.multiplicity = mult #how many times you have the category
+        self.quantity = quantity #how many times you have the category
 
     #return mean score of a category
     def meanScore(self, nbDice, nbRolls):
@@ -60,7 +60,7 @@ class Category:
         meanScore = 0
         for key in yacht_weights[self.name, min(8,nbDice), min(8,nbRolls)]:
             meanScore += key*yacht_weights[self.name, min(8,nbDice), min(8,nbRolls)][key]/100000
-        return meanScore
+        return meanScore * self.quantity
 
 
 
@@ -105,7 +105,7 @@ yachtdice_cache = {}
 
 #Function that returns the feasible score in logic based on items obtained.
 def diceSimulationStrings(categories, nbDice, nbRolls, multiplier, diff, scoremulttype):
-    tup = tuple([tuple(sorted([c.name+str(c.multiplicity) for c in categories])), nbDice, nbRolls, multiplier]) #identifier
+    tup = tuple([tuple(sorted([c.name+str(c.quantity) for c in categories])), nbDice, nbRolls, multiplier, diff, scoremulttype]) #identifier
     
     #if already computed, return the result
     if tup in yachtdice_cache.keys():
@@ -159,6 +159,10 @@ def diceSimulationStrings(categories, nbDice, nbRolls, multiplier, diff, scoremu
         # Return the first value if percentile is lower than all probabilities
         return prev_val if prev_val is not None else sorted_values[0]  
             
+            
+    percReturn = [0, 0.4, 0.4, 0.45, 0.45, 0.45][diff]
+    diffDivide = [0, 9, 5, 3, 2, 1][diff]
+    
     #calculate total distribution
     total_dist = {0: 1}
     for j in range(len(categories)):
@@ -172,17 +176,17 @@ def diceSimulationStrings(categories, nbDice, nbRolls, multiplier, diff, scoremu
             
             
         #for higher difficulties, the simulation gets multiple tries for categories.
-        dist = max_dist(dist, max(1, len(categories) // (10 - 2*diff)))
+        dist = max_dist(dist, max(1, len(categories) // diffDivide))
         
         cur_mult = -100
         if scoremulttype == 1: #fixed
             cur_mult = multiplier
         if scoremulttype == 2: #step
             cur_mult = j * multiplier
-        total_dist = add_distributions(total_dist, dist, (1 + cur_mult) * ( 2 ** (categories[j].multiplicity-1) ))
+        total_dist = add_distributions(total_dist, dist, (1 + cur_mult) * ( 2 ** (categories[j].quantity-1) ))
     
     #save result into the cache, then return it
-    yachtdice_cache[tup] = math.floor(percentile_distribution(total_dist, .20 + diff/10))
+    yachtdice_cache[tup] = math.floor(percentile_distribution(total_dist, percReturn))
     return yachtdice_cache[tup]
 
 # Returns the feasible score that one can reach with the current state, options and difficulty.
diff --git a/worlds/yachtdice/__init__.py b/worlds/yachtdice/__init__.py
index 97ce2b7ee1..aeca814332 100644
--- a/worlds/yachtdice/__init__.py
+++ b/worlds/yachtdice/__init__.py
@@ -153,6 +153,7 @@ class YachtDiceWorld(World):
                 
         if self.options.game_mode.value == 1:
             self.max_score = scoreInLogic
+            print(f"Max score: {self.max_score}, difficulty {game_difficulty}")
         
         if self.options.game_mode.value == 2:
             self.max_score = 1000