diff --git a/src/Reweight/T2KWeightEngine.cxx b/src/Reweight/T2KWeightEngine.cxx
index 0e5a3a2..c4725e9 100644
--- a/src/Reweight/T2KWeightEngine.cxx
+++ b/src/Reweight/T2KWeightEngine.cxx
@@ -1,146 +1,148 @@
 #include "T2KWeightEngine.h"
+#ifdef __T2KREW_ENABLED__
 #include "T2KNeutUtils.h"
+#endif
 
 T2KWeightEngine::T2KWeightEngine(std::string name) {
 #ifdef __T2KREW_ENABLED__
 
   std::string neut_card = FitPar::Config().GetParS("NEUT_CARD");
   if (!neut_card.size()) {
     NUIS_ABORT(
         "[ERROR]: When using T2KReWeight must set NEUT_CARD config option.");
   }
 
   t2krew::T2KNeutUtils::SetCardFile(neut_card);
 
   // Setup the NEUT Reweight engien
   fCalcName = name;
   NUIS_LOG(FIT, "Setting up T2K RW : " << fCalcName);
 
   // Create RW Engine suppressing cout
   StopTalking();
 
   // Create Main RW Engine
   fT2KRW = new t2krew::T2KReWeight();
 
   // Setup Sub RW Engines (Only activated for neut and niwg)
   fT2KNeutRW = new t2krew::T2KNeutReWeight();
   fT2KNIWGRW = new t2krew::T2KNIWGReWeight();
 
   fT2KRW->AdoptWghtEngine("fNeutRW", fT2KNeutRW);
   fT2KRW->AdoptWghtEngine("fNIWGRW", fT2KNIWGRW);
 
   fT2KRW->Reconfigure();
 
   // allow cout again
   StartTalking();
 
   // Set Abs Twk Config
   fIsAbsTwk = (FitPar::Config().GetParB("setabstwk"));
 
 #else
   NUIS_ABORT("T2K RW NOT ENABLED");
 #endif
 };
 
 void T2KWeightEngine::IncludeDial(std::string name, double startval) {
 #ifdef __T2KREW_ENABLED__
 
   // Get First enum
   int nuisenum = Reweight::ConvDial(name, kT2K);
 
   // Setup Maps
   fEnumIndex[nuisenum]; // = std::vector<size_t>(0);
   fNameIndex[name];     // = std::vector<size_t>(0);
 
   // Split by commas
   std::vector<std::string> allnames = GeneralUtils::ParseToStr(name, ",");
   for (uint i = 0; i < allnames.size(); i++) {
     std::string singlename = allnames[i];
 
     // Get RW
     t2krew::T2KSyst_t gensyst = t2krew::T2KSyst::FromString(name);
 
     // Fill Maps
     int index = fValues.size();
     fValues.push_back(0.0);
     fT2KSysts.push_back(gensyst);
 
     // Initialize dial
     std::cout << "Registering " << singlename << " from " << name << std::endl;
     fT2KRW->Systematics().Include(gensyst);
 
     // If Absolute
     if (fIsAbsTwk) {
       fT2KRW->Systematics().SetAbsTwk(gensyst);
     }
 
     // Setup index
     fEnumIndex[nuisenum].push_back(index);
     fNameIndex[name].push_back(index);
   }
 
   // Set Value if given
   if (startval != _UNDEF_DIAL_VALUE_) {
     SetDialValue(nuisenum, startval);
   }
 #endif
 }
 
 void T2KWeightEngine::SetDialValue(int nuisenum, double val) {
 #ifdef __T2KREW_ENABLED__
   std::vector<size_t> indices = fEnumIndex[nuisenum];
   for (uint i = 0; i < indices.size(); i++) {
     fValues[indices[i]] = val;
     fT2KRW->Systematics().SetTwkDial(fT2KSysts[indices[i]], val);
   }
 #endif
 }
 
 void T2KWeightEngine::SetDialValue(std::string name, double val) {
 #ifdef __T2KREW_ENABLED__
   std::vector<size_t> indices = fNameIndex[name];
   for (uint i = 0; i < indices.size(); i++) {
     fValues[indices[i]] = val;
     fT2KRW->Systematics().SetTwkDial(fT2KSysts[indices[i]], val);
   }
 #endif
 }
 
 void T2KWeightEngine::Reconfigure(bool silent) {
 #ifdef __T2KREW_ENABLED__
   // Hush now...
   if (silent)
     StopTalking();
 
   // Reconf
   StopTalking();
   fT2KRW->Reconfigure();
   StartTalking();
 
   // Shout again
   if (silent)
     StartTalking();
 #endif
 }
 
 double T2KWeightEngine::CalcWeight(BaseFitEvt *evt) {
   double rw_weight = 1.0;
 
 #ifdef __T2KREW_ENABLED__
   // Skip Non GENIE
   if (evt->fType != kNEUT)
     return 1.0;
 
   // Hush now
   StopTalking();
 
   // Get Weight For NEUT
   rw_weight = fT2KRW->CalcWeight(evt->fNeutVect);
 
   // Speak Now
   StartTalking();
 #endif
 
   // Return rw_weight
   return rw_weight;
 }