diff --git a/Config.json b/Config.json
index ca39d5d..b7b319f 100644
--- a/Config.json
+++ b/Config.json
@@ -9,12 +9,12 @@
     "experiment" : "solid",
     //"experiment" : "eic",
 
+//	"file_name" : "example_output",
     "n_events" : 10000,
 //    "output_file" : "RootFiles/Test.root",
 
 	//**************************************
     /// This section if for EIC simulation only
-	"file_name" : "example_output",
 	"Targ_dir" : 1,                // Target Direction (1->Up, 2->Down)
 	"Kinematics_type" : 1,         // Kinematics type (1->FF, 2->TSSA)
 
diff --git a/include/TreeBuilder.hxx b/include/TreeBuilder.hxx
index af3b7c4..c3e49c5 100644
--- a/include/TreeBuilder.hxx
+++ b/include/TreeBuilder.hxx
@@ -23,7 +23,7 @@ class TreeBuilder
   int nVars;
 
   const char* tree_name;
-  const char* file_name;
+//  const char* file_name;
 
   TTree * Tree_Out;
   TFile * File_Out;
@@ -31,7 +31,7 @@ class TreeBuilder
   void Retrieve();
 public:
 
-  TreeBuilder(const char * name);
+  TreeBuilder(const char*, const char*);
 
   void AddParticle(Particle * p);
   void AddDouble(double * x, const char* name);
diff --git a/src/TreeBuilder.cxx b/src/TreeBuilder.cxx
index a9d59cb..36d19fa 100644
--- a/src/TreeBuilder.cxx
+++ b/src/TreeBuilder.cxx
@@ -11,20 +11,19 @@
 
 using namespace std;
 
-TreeBuilder::TreeBuilder(const char * name)
-{
+TreeBuilder::TreeBuilder(const char * file_name, const char * name) {
 
   extern Json::Value obj;
 
   tree_name = name;
-  string str_copy = "RootFiles/" + obj["file_name"].asString() + ".root";
-  file_name = str_copy.c_str();
-
-  cout << obj["output_file"].asString() << endl;
 
-  cout << file_name << endl;
+//  string str_copy = "RootFiles/" + obj["file_name"].asString() + ".root";
+//  file_name = str_copy.c_str();
+//
+//  cout << obj["output_file"].asString() << endl;
+//  cout << file_name << endl;
+//  cout << file_name <<endl;
 
-  cout << file_name <<endl;
 
   File_Out = new TFile(file_name, "RECREATE");
   Tree_Out = new TTree(tree_name, tree_name);
diff --git a/src/eic_evgen/eic.cc b/src/eic_evgen/eic.cc
index c182243..22a67bd 100644
--- a/src/eic_evgen/eic.cc
+++ b/src/eic_evgen/eic.cc
@@ -42,13 +42,13 @@ void eic() {
    	cout << "Enter the number of events: ";        cin >> fNEvents;         cout << endl;
    	cout << "Enter the file number: ";             cin >> fNFile;           cout << endl;
  
-	eic(target_direction, kinematics_type, fNEvents);
+//	eic(target_direction, kinematics_type, fNEvents);
 
 }
 
 
 
-void eic(int event_number, int target_direction, int kinematics_type) {
+void eic(int event_number, int target_direction, int kinematics_type, TString file_name) {
 
 
 	fNFile = 1;
@@ -81,11 +81,11 @@ void eic(int event_number, int target_direction, int kinematics_type) {
 
 
    string sTFile;
-   sTFile = Form("./LundFiles/eic_demp_%i.txt",(int)fNFile);
+   sTFile = Form("./LundFiles/eic_%s.txt", file_name.Data());
    string sRFile;
-   sRFile = Form("./RootFiles/eic_demp_%i.root",(int)fNFile);
+   sRFile = Form("./RootFiles/eic_%s.root", file_name.Data());
    string sLFile;
-   sLFile= Form("./LundFiles/input_%i.dat",(int)fNFile);
+   sLFile= Form("./LundFiles/eic_input_%s.dat", file_name.Data());
    
    ofstream ppiOut ( sLFile.c_str() );
    ofstream ppiDetails ( sTFile.c_str() );
diff --git a/src/eic_evgen/eic.h b/src/eic_evgen/eic.h
index 9754f8e..de5774c 100644
--- a/src/eic_evgen/eic.h
+++ b/src/eic_evgen/eic.h
@@ -41,7 +41,7 @@
 
 
 void eic();
-void eic(int, int, int);
+void eic(int, int, int, TString);
 
 
 
diff --git a/src/main.cxx b/src/main.cxx
index 0418943..a6edd02 100644
--- a/src/main.cxx
+++ b/src/main.cxx
@@ -184,7 +184,10 @@ int main(int argc, char** argv){
    
      int event_status = 0;
    
-     TreeBuilder * Output = new TreeBuilder("t1");
+
+	 file_name = "RootFiles/Solid_DEMP_" + file_name + ".root";
+
+     TreeBuilder * Output = new TreeBuilder(file_name.Data(), "t1");
    
      Output->AddEvent(VertEvent);
      //Output->AddEvent(CofMEvent);