diff --git a/Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_self.hpp b/Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_self.hpp
index 36ee4b94..01415f75 100644
--- a/Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_self.hpp
+++ b/Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_self.hpp
@@ -116,14 +116,14 @@ class base_mode_attach
 class Drink
 {
 	condition = "dyna_Watersource";
-	action = "if (currentweapon player == '') then {player playmove 'AinvPknlMstpSnonWnonDnon_Putdown_AmovPknlMstpSnonWnonDnon';}else {if (currentweapon player == handgunweapon player) then {player playmove 'AinvPknlMstpSrasWpstDnon_Putdown_AmovPknlMstpSrasWpstDnon';}else {	player playmove 'AinvPknlMstpSrasWrflDnon_Putdown_AmovPknlMstpSrasWrflDnon';};};{_output = _x call EPOCH_giveAttributes;if (_output != '') then {[_output, 5] call Epoch_message_stack;};} foreach [['Toxicity',4,1],['Stamina',10],['Thirst',100]];";
+	action = "if (currentweapon player == '') then {player playmove 'AinvPknlMstpSnonWnonDnon_Putdown_AmovPknlMstpSnonWnonDnon';}else {if (currentweapon player == handgunweapon player) then {player playmove 'AinvPknlMstpSrasWpstDnon_Putdown_AmovPknlMstpSrasWpstDnon';}else {	player playmove 'AinvPknlMstpSrasWrflDnon_Putdown_AmovPknlMstpSrasWrflDnon';};};{_output = _x call EPOCH_giveAttributes;if (_output != '') then {[_output, 5] call Epoch_message_stack;};} foreach [['Thirst',100],['Toxicity',1,1],['Stamina',10]];";
 	icon = "x\addons\a3_epoch_code\Data\UI\buttons\Drink.paa";
 	tooltip = "Drink";
 };
 class Wash
 {
 	condition = "dyna_Watersource";
-	action = "player playMove 'AinvPknlMstpSnonWrflDnon_medic0';player playMove 'AinvPknlMstpSnonWrflDnon_medicEnd';{_output = _x call EPOCH_giveAttributes;if (_output != '') then {[_output, 5] call Epoch_message_stack;};} foreach [['Soiled',-25]];";
+	action = "if !('Soap_Epoch' in magazines player) exitwith {['You need a Soap to wash yourself',5] call Epoch_Message;};[] spawn {player playMove 'AinvPknlMstpSnonWrflDnon_medic0';player playMove 'AinvPknlMstpSnonWrflDnon_medicEnd';['Washing ...',5] call Epoch_Message;player removeitem "Soap_Epoch";uisleep 6;{_output = _x call EPOCH_giveAttributes;	if (_output != '') then {[_output, 5] call Epoch_message_stack;};} foreach [['Soiled',-25]];};";
 	icon = "x\addons\a3_epoch_code\Data\UI\buttons\Washing.paa";
 	tooltip = "Wash yourself";
 };
diff --git a/Sources/epoch_config/Configs/CfgItemInteractions.hpp b/Sources/epoch_config/Configs/CfgItemInteractions.hpp
index b5f99e98..4784b400 100644
--- a/Sources/epoch_config/Configs/CfgItemInteractions.hpp
+++ b/Sources/epoch_config/Configs/CfgItemInteractions.hpp
@@ -999,7 +999,7 @@ class CfgItemInteractions
 	};
 	class ItemCanteen_Clean : Drink_base
 	{
-		interactAttributes[] = {{"Thirst",1000},{"Stamina",50}};
+		interactAttributes[] = {{"Thirst",1000},{"Stamina",100}};
 		interactReturnOnUse = "ItemCanteen_Empty";
 	};
 	class ItemBottlePlastic_Dirty: Drink_base
@@ -1010,7 +1010,7 @@ class CfgItemInteractions
 
 	class ItemCanteen_Dirty : Drink_base
 	{
-		interactAttributes[] = {{"Thirst",1000},{"Toxicity",5,1},{"Stamina",50},{"Radiation",2,1}};
+		interactAttributes[] = {{"Thirst",1000},{"Toxicity",10,1},{"Stamina",100},{"Radiation",4,1}};
 		interactReturnOnUse = "ItemCanteen_Empty";
 	};
 	class adrenaline_epoch : Drink_base