--- branches/development/src/io/Globals.cpp	2010/12/17 20:11:05	1528
+++ branches/development/src/io/Globals.cpp	2011/08/18 20:18:19	1613
@@ -146,7 +146,6 @@ Globals::Globals() {
   deprecatedKeywords_.insert("thermIntOmegaSpringConst");
   deprecatedKeywords_.insert("useSolidThermInt");  
   deprecatedKeywords_.insert("useLiquidThermInt");
-  deprecatedKeywords_.insert("cutoffPolicy");
     
 }
 
@@ -192,6 +191,7 @@ void Globals::validate() {
   CheckParameter(ForceFieldVariant, isNotEmpty());
   CheckParameter(ForceFieldFileName, isNotEmpty());
   CheckParameter(CutoffMethod, isEqualIgnoreCase("HARD") || isEqualIgnoreCase("SWITCHED") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE"));
+  CheckParameter(CutoffPolicy, isEqualIgnoreCase("MIX") || isEqualIgnoreCase("MAX") || isEqualIgnoreCase("TRADITIONAL"));
   CheckParameter(ElectrostaticSummationMethod, isEqualIgnoreCase("HARD") || isEqualIgnoreCase("SWITCHED") || isEqualIgnoreCase("SHIFTED_POTENTIAL") || isEqualIgnoreCase("SHIFTED_FORCE") || isEqualIgnoreCase("REACTION_FIELD"));
   CheckParameter(ElectrostaticScreeningMethod, isEqualIgnoreCase("UNDAMPED") || isEqualIgnoreCase("DAMPED")); 
   CheckParameter(SwitchingFunctionType, isEqualIgnoreCase("CUBIC") || isEqualIgnoreCase("FIFTH_ORDER_POLYNOMIAL"));
@@ -219,7 +219,7 @@ void Globals::validate() {
     }
   }
 }
-  
+
 bool Globals::addComponent(Component* comp) {
     components_.push_back(comp);
     return true;