diff --git a/Release/PRC8_20240925.7z b/Release/PRC8_20240925.7z
index fdb337bf..e86d77cb 100644
Binary files a/Release/PRC8_20240925.7z and b/Release/PRC8_20240925.7z differ
diff --git a/nwn/nwnprc/trunk/include/inc_epicspells.nss b/nwn/nwnprc/trunk/include/inc_epicspells.nss
index 6289b6dc..ec3eac9d 100644
--- a/nwn/nwnprc/trunk/include/inc_epicspells.nss
+++ b/nwn/nwnprc/trunk/include/inc_epicspells.nss
@@ -335,7 +335,7 @@ int GetIsEpicWitch(object oPC)
 
 int GetIsEpicWizard(object oPC)
 {
-    return GetPrCAdjustedCasterLevel(CLASS_TYPE_WIZARD, oPC, FALSE) > 16
+    return GetPrCAdjustedCasterLevel(CLASS_TYPE_WIZARD, oPC, FALSE) >= 17
          && GetAbilityScore(oPC, ABILITY_INTELLIGENCE) > 18;
 }
 
@@ -360,6 +360,7 @@ int GetIsEpicSpellcaster(object oPC)
     || GetIsEpicWitch(oPC)
     || GetIsEpicWizard(oPC))
         return TRUE;
+		
     return FALSE;
 }
 
diff --git a/nwn/nwnprc/trunk/makefile.temp b/nwn/nwnprc/trunk/makefile.temp
index 61051e50..8a473466 100644
--- a/nwn/nwnprc/trunk/makefile.temp
+++ b/nwn/nwnprc/trunk/makefile.temp
@@ -338,7 +338,6 @@ include\prc_inc_drugfunc.nss \
 include\prc_inc_effect.nss \
 include\prc_inc_factotum.nss \
 include\prc_inc_fork.nss \
-include\prc_inc_function.ncs \
 include\prc_inc_function.nss \
 include\prc_inc_hextor.nss \
 include\prc_inc_itmrstr.nss \
diff --git a/nwn/nwnprc/trunk/scripts/prc_rest.nss b/nwn/nwnprc/trunk/scripts/prc_rest.nss
index 05eab1cd..6eb59e77 100644
--- a/nwn/nwnprc/trunk/scripts/prc_rest.nss
+++ b/nwn/nwnprc/trunk/scripts/prc_rest.nss
@@ -80,11 +80,22 @@ void RestFinished(object oPC)
             AssignCommand(oSlave, ActionRest());
             //ForceRest(oSlave);
 
-    if (GetIsEpicSpellcaster(oPC)) {
+	if (GetHasFeat(FEAT_EPIC_SPELLCASTING, oPC))
+	{
+        FloatingTextStringOnCreature("*You feel refreshed*", oPC, FALSE);
+        ReplenishSlots(oPC);
+    }	
+	
+/*     if (GetIsEpicSpellcaster(oPC) == TRUE) 
+	{
         FloatingTextStringOnCreature("*You feel refreshed*", oPC, FALSE);
         ReplenishSlots(oPC);
     }
-
+	else
+	{
+		if (DEBUG) DoDebug("prc_rest: Not an Epic Spellcaster");
+	}
+ */
     if (GetHasFeat(FEAT_SF_CODE,oPC))
         DelayCommand(0.1, RemoveSpecificProperty(GetPCSkin(oPC),ITEM_PROPERTY_BONUS_FEAT,IP_CONST_FEAT_SF_CODE));