diff --git a/ChallengeModConfig.xml b/ChallengeModConfig.xml
index 7cc9948..0ee9995 100644
--- a/ChallengeModConfig.xml
+++ b/ChallengeModConfig.xml
@@ -3,6 +3,7 @@
 	<VictoryPoints prefix="CM_VictoryPoints" goal="1000000">
 		<Category name="general">
 			<Element genericFunc="addMoneyFactor" unitTextFunc="MONEY_TEXT" name="money" default="1" />
+			<Element genericFunc="addLoanFactor" unitTextFunc="MONEY_TEXT" name="loan" default="1" />
 			<Element genericFunc="addAreaFactor" unitTextFunc="AREA_TEXT" name="area" default="1" />
 			<Element genericFunc="addBuildingsFactor" unitTextFunc="MONEY_TEXT" name="ownedBuildingValue" default="1" />
 			<Element genericFunc="addVehiclesFactor" unitTextFunc="MONEY_TEXT" name="ownedVehicleValue" default="1" />
diff --git a/scripts/VictoryPointManager.lua b/scripts/VictoryPointManager.lua
index abb920f..038b1a3 100644
--- a/scripts/VictoryPointManager.lua
+++ b/scripts/VictoryPointManager.lua
@@ -177,9 +177,18 @@ end
 function VictoryPointManager:addMoneyFactor(category, factorData, farmId)
 	local farm = g_farmManager:getFarmById(farmId)
 	local money = farm and farm.money - farm.loan or 0
+	-- prevents negative points if loan is higher than money
+	money = math.max(money, 0)
 	category:addElement(VictoryPoint.createFromXml(factorData, money))
 end
 
+function VictoryPointManager:addLoanFactor(category, factorData, farmId)
+	local farm = g_farmManager:getFarmById(farmId)
+	local loan = farm and farm.loan or 0
+	loan = -loan
+	category:addElement(VictoryPoint.createFromXml(factorData, loan))
+end
+
 function VictoryPointManager:addAreaFactor(category, factorData, farmId)
 	local area = VictoryPointsUtil.getTotalArea(farmId)
 	category:addElement(VictoryPoint.createFromXml(factorData, area))
diff --git a/scripts/VictoryPointsUtil.lua b/scripts/VictoryPointsUtil.lua
index 66bf621..b6fcd67 100644
--- a/scripts/VictoryPointsUtil.lua
+++ b/scripts/VictoryPointsUtil.lua
@@ -18,7 +18,7 @@ function VictoryPointsUtil.getStorageAmount(farmId, maxFillLevel)
 				if totalFillLevels[fillType] == nil then
 					totalFillLevels[fillType] = 0
 				end
-				totalFillLevels[fillType] = totalFillLevels[fillType] + math.min(v, maxFillLevel)
+				totalFillLevels[fillType] = math.min(totalFillLevels[fillType] + v, maxFillLevel)
 			end
 		end
 	end
@@ -32,7 +32,21 @@ function VictoryPointsUtil.getStorageAmount(farmId, maxFillLevel)
 			if totalFillLevels[fillType] == nil then
 				totalFillLevels[fillType] = 0
 			end
-			totalFillLevels[fillType] = totalFillLevels[fillType] + math.min(fillLevel, maxFillLevel)
+			totalFillLevels[fillType] = math.min(totalFillLevels[fillType] + fillLevel, maxFillLevel)
+		end
+	end
+
+	if g_isModLoaded.FS22_ObjectStorage then
+		local objectStorages = g_objectStorageManager:getStorages()
+
+		for _, storage in pairs(objectStorages) do
+			if storage.ownerFarmId == farmId then
+				for _, storageArea in pairs(storage.indexedStorageAreas) do
+					for _, objectAttributes in pairs(storageArea.objects) do
+						totalFillLevels[objectAttributes.fillType] = math.min(totalFillLevels[objectAttributes.fillType] + objectAttributes.fillLevel, maxFillLevel)
+					end
+				end
+			end
 		end
 	end
 
@@ -58,7 +72,7 @@ function VictoryPointsUtil.getBaleAmount(farmId, maxFillLevel)
 			if baleFillLevels[object.fillType] == nil then
 				baleFillLevels[object.fillType] = 0
 			end
-			baleFillLevels[object.fillType] = baleFillLevels[object.fillType] + math.min(object.fillLevel, maxFillLevel)
+			baleFillLevels[object.fillType] = math.min(baleFillLevels[object.fillType] + object.fillLevel, maxFillLevel)
 		end
 	end
 	return baleFillLevels
@@ -77,7 +91,7 @@ function VictoryPointsUtil.getPalletAmount(farmId, maxFillLevel, totalFillLevels
 			if totalFillLevels[fillType] == nil then
 				totalFillLevels[fillType] = 0
 			end
-			totalFillLevels[fillType] = totalFillLevels[fillType] + math.min(fillLevel, maxFillLevel)
+			totalFillLevels[fillType] = math.min(totalFillLevels[fillType] + fillLevel, maxFillLevel)
 		end
 	end
 	return totalFillLevels
diff --git a/translations/translation_de.xml b/translations/translation_de.xml
index d16beae..0053938 100644
--- a/translations/translation_de.xml
+++ b/translations/translation_de.xml
@@ -48,13 +48,13 @@ Eine Dauer von 0 Monaten deaktiviert das Zeitlimit."
 		<text name="CM_dialog_setGoal_error_invalidGoal" 						text="Ziel muss eine Zahl sein!"/>
 		<text name="CM_dialog_setDuration_error_invalidDuration" 				text="Dauer muss eine positive Zahl sein!"/>
 
-
 		<text name="CM_VictoryPoints_leftTitle" 								text=""/>
 		<text name="CM_VictoryPoints_middleTitle" 								text="Faktor"/>
 		<text name="CM_VictoryPoints_rightTitle" 								text="Wert"/>
 
 		<text name="CM_VictoryPoints_general_title" 							text=""/>
 		<text name="CM_VictoryPoints_general_money_title"						text="Geld ohne Kredit"/>
+		<text name="CM_VictoryPoints_general_loan_title"						text="Kreditstrafe"/>
 		<text name="CM_VictoryPoints_general_area_title" 						text="Fläche"/>
 		<text name="CM_VictoryPoints_general_ownedBuildingValue_title" 			text="Gebäude Verkaufswert"/>
 		<text name="CM_VictoryPoints_general_ownedVehicleValue_title" 			text="Fahrzeuge Verkaufswert"/>
@@ -62,6 +62,7 @@ Eine Dauer von 0 Monaten deaktiviert das Zeitlimit."
 
 		<text name="CM_VictoryPoints_general_input_text" 						text=""/>
 		<text name="CM_VictoryPoints_general_money_input_text" 					text="Gib ein wie viel Geld einem Punkt entspricht."/>
+		<text name="CM_VictoryPoints_general_loan_input_text" 					text="Gib ein wie viel Kredit einem Strafpunkt entspricht."/>
 		<text name="CM_VictoryPoints_general_area_input_text" 					text="Gib ein wie viel Hektar Land einem Punkt entsprechen."/>
 		<text name="CM_VictoryPoints_general_ownedBuildingValue_input_text" 	text="Gib ein wie viel Gebäudeverkaufswert einem Punkt entspricht."/>
 		<text name="CM_VictoryPoints_general_ownedVehicleValue_input_text" 		text="Gib ein wie viel Fahrzeugverkaufswert einem Punkt entspricht."/>
diff --git a/translations/translation_en.xml b/translations/translation_en.xml
index 6c5f372..1ca960b 100644
--- a/translations/translation_en.xml
+++ b/translations/translation_en.xml
@@ -54,6 +54,7 @@ A duration of 0 months will deactivate the time limit."
 
 		<text name="CM_VictoryPoints_general_title"								text=""/>
 		<text name="CM_VictoryPoints_general_money_title"						text="Money without credit"/>
+		<text name="CM_VictoryPoints_general_loan_title"						text="Loan punishment"/>
 		<text name="CM_VictoryPoints_general_area_title"						text="Area"/>
 		<text name="CM_VictoryPoints_general_ownedBuildingValue_title"			text="Building sell value"/>
 		<text name="CM_VictoryPoints_general_ownedVehicleValue_title"			text="Vehicle sell value"/>
@@ -61,6 +62,7 @@ A duration of 0 months will deactivate the time limit."
 
 		<text name="CM_VictoryPoints_general_input_text" 						text=""/>
 		<text name="CM_VictoryPoints_general_money_input_text" 					text="Please enter how much money equals one point."/>
+		<text name="CM_VictoryPoints_general_loan_input_text" 					text="Please enter how much loan equals one punishment point."/>
 		<text name="CM_VictoryPoints_general_area_input_text" 					text="Please enter how much hectares of land equals one point."/>
 		<text name="CM_VictoryPoints_general_ownedBuildingValue_input_text" 	text="Please enter how much building sell value equals one point."/>
 		<text name="CM_VictoryPoints_general_ownedVehicleValue_input_text" 		text="Please enter how much vehicle sell value equals one point."/>