diff --git a/src/FitBase/SampleSettings.cxx b/src/FitBase/SampleSettings.cxx
index 5388c0d..f574209 100644
--- a/src/FitBase/SampleSettings.cxx
+++ b/src/FitBase/SampleSettings.cxx
@@ -1,226 +1,231 @@
 #include "SampleSettings.h"
 
 SampleSettings::SampleSettings() {
 };
 
 SampleSettings::SampleSettings(nuiskey key) {
 	fKeyValues = key;
 	if (!key.Has("type")) key.AddS("type", "DEFAULT");
 }
 
 std::string SampleSettings::GetName() {
 	return GetS("name");
 }
 
 void SampleSettings::SetS(std::string name, std::string val) {
 	fKeyValues.SetS(name, val);
 };
 
 bool SampleSettings::Found(std::string name, std::string substr) {
 	std::string compstring = fKeyValues.GetS(name);
 	return compstring.find(substr) != std::string::npos;
 }
 
 
 void SampleSettings::SetXTitle(std::string name) {
 	SetDefault("xtitle", name);
 };
 
 void SampleSettings::SetYTitle(std::string name) {
 	SetDefault("ytitle", name);
 };
 
 
 void SampleSettings::SetZTitle(std::string name) {
 	SetDefault("ztitle", name);
 };
 
 void SampleSettings::SetNormError(double norm) {
 	SetDefault("norm_error", GeneralUtils::DblToStr(norm));
 };
 
 double SampleSettings::GetNormError() {
   return GetD("norm_error");
 };
 
 std::string SampleSettings::GetCovarInput() {
 	return GetS("covar");
 }
 
 void SampleSettings::SetAllowedTypes(std::string allowed, std::string defaulttype) {
 	SetDefault("default_types", allowed);
 	SetDefault("allowed_types", defaulttype);
 };
 
 void SampleSettings::SetEnuRangeFromFlux(TH1D* fluxhist) {
 	double enu_min = fluxhist->GetXaxis()->GetXmin();
 	double enu_max = fluxhist->GetXaxis()->GetXmax();
 	SetEnuRange(enu_min, enu_max);
 };
 
 void SampleSettings::SetEnuRange(double min, double max) {
 	SetDefault("enu_min", min);
 	SetDefault("enu_max", max);
 };
 
 void SampleSettings::Set(std::string name, double d) {
 	SetDefault(name, d);
 }
 
 void SampleSettings::Set(std::string name, int i) {
 	SetDefault(name, i);
 }
 
 void SampleSettings::Set(std::string name, std::string s) {
 	SetDefault(name, s);
 }
 
 
 
 void SampleSettings::DefineAllowedTargets(std::string targ) {
 	// fAllowedTargets = TargetUtils::ParseTargetsToIntVect(targ);
 };
 
 
 void SampleSettings::FoundFill(std::string name, std::string substr, bool& cont, bool def) {
 	std::string compstring = fKeyValues.GetS(name);
 	if (compstring.find(substr) != std::string::npos) {
 		cont = def;
 	} else {
 		cont = !def;
 	}
 };
 
 
 void SampleSettings::SetTitle(std::string val) {
 	SetDefault("title", val);
 };
 
 void SampleSettings::SetDataInput(std::string val) {
 	SetDefault("data", val);
 };
 
 std::string SampleSettings::GetMapInput() {
 	return GetS("map");
 }
 void SampleSettings::SetMapInput(std::string val) {
 	SetDefault("map", val);
 }
 
 void SampleSettings::SetErrorInput(std::string val) {
 	SetDefault("error", val);
 };
 
 
 
 void SampleSettings::SetCovarInput(std::string val) {
 	SetDefault("covar", val);
 };
 
+void SampleSettings::SetShapeCovarInput(std::string val) {
+  SetDefault("shapecovar", val);
+};
+
+
 void SampleSettings::SetDefault(std::string name, std::string val) {
 	if (!fKeyValues.Has(name)) fKeyValues.AddS(name, val);
 };
 
 void SampleSettings::SetDefault(std::string name, double val ) {
 	if (!fKeyValues.Has(name)) fKeyValues.AddD(name, val);
 };
 
 void SampleSettings::SetHasExtraHistograms(bool opt) {
 	fHasExtraHistograms = opt;
 };
 
 void SampleSettings::DefineAllowedSpecies(std::string species) {
 	fAllowedTargets = BeamUtils::ParseSpeciesToIntVect(species);
 };
 
 std::string SampleSettings::Title() {
 	return GetS("title");
 }
 
 std::string SampleSettings::GetDataInput() {
 	return GetS("data");
 };
 
 
 std::string SampleSettings::GetErrorInput() {
 	return GetS("error");
 };
 
 std::string SampleSettings::PlotTitles() {
 	return ";" + GetS("xtitle") + ";" + GetS("ytitle");
 };
 
 std::string SampleSettings::GetFullTitles() {
 	return Title() + PlotTitles();
 }
 
 int SampleSettings::GetI(std::string name) {
 	return fKeyValues.GetI(name);
 }
 
 bool SampleSettings::GetB(std::string name){
 	return fKeyValues.GetB(name);
 }
 
 
 double SampleSettings::GetD(std::string name) {
 	return fKeyValues.GetD(name);
 }
 
 std::string SampleSettings::GetS(std::string name) {
 	return fKeyValues.GetS(name);
 }
 
 void SampleSettings::SetSuggestedFlux(std::string str) {
 	SetS("suggested_flux", str);
 }
 
 void SampleSettings::SetDescription(std::string str) {
 	SetS("description", str);
 }
 
 void SampleSettings::Write(std::string name) {
 
 	if (name.empty()) name = this->GetS("name") + "_settings";
 
 	// Make a new canvas
 	TCanvas* c1 = new TCanvas( name.c_str(), name.c_str(), 800, 600 );
 	c1->cd();
 
 	// Make new TPaveText
 	TPaveText pttitle = TPaveText(0.05, 0.85, 0.95, 0.95);
 	pttitle.AddText( name.c_str() );
 	pttitle.SetTextAlign(11);
 	pttitle.SetTextSize(15);
 	pttitle.Draw();
 
 
 	TPaveText pt = TPaveText(0.05, 0.05, 0.95, 0.80);
 	std::vector<std::string> keys = fKeyValues.GetAllKeys();
 	for (int i = 0; i < keys.size(); i++) {
 
 		std::string keyval = fKeyValues.GetS(keys[i]);
 		std::vector<std::string> lines = GeneralUtils::ParseToStr(keyval, "\n");
 
 		if (lines.size() == 1) {
 			pt.AddText( ("#bullet #bf{" + keys[i] + "} : " + fKeyValues.GetS(keys[i])).c_str() );
 		} else {
 			pt.AddText( ("#bullet #bf{" + keys[i] + "} : ").c_str() );
 			for (int j = 0; j < lines.size(); j++) {
 				pt.AddText(("   |-->  " + lines[j]).c_str() );
 			}
 		}
 	}
 
 	pt.SetTextAlign(11);
 	pt.SetTextSize(14);
 	pt.Draw("SAME");
 
 
 	c1->Write();
 	delete c1;
 }
 
 void SampleSettings::SetOnlyMC(bool state) {
 	SetDefault("onlymc", state);
 }
diff --git a/src/FitBase/SampleSettings.h b/src/FitBase/SampleSettings.h
index e689eeb..358a584 100644
--- a/src/FitBase/SampleSettings.h
+++ b/src/FitBase/SampleSettings.h
@@ -1,74 +1,77 @@
 #ifndef SAMPLESETTINGS_H
 #define SAMPLESETTINGS_H
 #include "NuisConfig.h"
 #include "NuisKey.h"
 #include "TH1D.h"
 #include "BeamUtils.h"
 #include "TPaveText.h"
 #include "TCanvas.h"
 
 class SampleSettings {
 public:
 	SampleSettings();
 	SampleSettings(nuiskey key);
 
 	inline std::string Name(){return GetName();};
 	std::string GetName();
 	void SetS(std::string name, std::string val);
 	void SetXTitle(std::string name);
 	void SetYTitle(std::string name);
 	void SetZTitle(std::string name);
 	void SetNormError(double norm);
 	double GetNormError();
 
 	void SetAllowedTypes(std::string allowed, std::string defaulttype="FIX");
 	void SetEnuRangeFromFlux(TH1D* fluxhist);
 	void SetEnuRange(double min, double max);
 	std::string Title();
 	void DefineAllowedTargets(std::string targ);
 
 	void FoundFill(std::string name, std::string substr, bool& cont, bool def);
 	// void FoundFill(std::string name, std::string substr, double& val, double )
 	bool Found(std::string name, std::string substr);
 	void SetTitle(std::string val);
 	void SetDataInput(std::string val);
 	void SetErrorInput(std::string val);
 	std::string GetErrorInput();
 
 	std::string GetMapInput();
 	void SetMapInput(std::string val);
 	void SetCovarInput(std::string val);
+	void SetShapeCovarInput(std::string val);
 
 	void SetDefault(std::string name, std::string val);
 	void SetDefault(std::string name, double val);
 	void SetHasExtraHistograms(bool opt = true);
 	void DefineAllowedSpecies(std::string species);
 	void SetSuggestedFlux(std::string str);
 	void SetDescription(std::string str);
 
 	void Write(std::string name="");
 
 	std::string GetFullTitles();
 	
 	bool Has(std::string name){return fKeyValues.Has(name);};
 
 	std::string GetDataInput();
 	std::string PlotTitles();
 	std::string GetS(std::string name);
 	int GetI(std::string name);
 	double GetD(std::string name);
 	std::string GetCovarInput();
 	void SetOnlyMC(bool state=true);
 	bool GetB(std::string name);
 
 	void Set(std::string name, int i);
 	void Set(std::string name, std::string s);
 	void Set(std::string name, double d);
 
+	
+
 	std::vector<int> fAllowedTargets;
 	std::vector<int> fAllowedSpecies;
   	nuiskey fKeyValues;
   	bool fHasExtraHistograms;
 };
 
 #endif