diff --git a/Inputs/DetectorConfiguration/Riken_65mm.detector b/Inputs/DetectorConfiguration/Riken_65mm.detector
index 4b8151dd70c82289d48ccf93258d020fda2bcd65..6e69943152cf28638e5df00c77501f5b09688edf 100644
--- a/Inputs/DetectorConfiguration/Riken_65mm.detector
+++ b/Inputs/DetectorConfiguration/Riken_65mm.detector
@@ -128,7 +128,7 @@ VIS=    all
 
 
 %%%%%%%%%%%%%%%%%%%%%			
-%AddThinSi			
+AddThinSi			
 %%%%%%%%%% Det 1 %%%%%%%%			
 ThinSi			
 A=	17.61	9.85	104.11
diff --git a/NPAnalysis/Template/src/Analysis.cc b/NPAnalysis/Template/src/Analysis.cc
index 786355c53ae9f080bae9ba1f12ec0735f131006c..5a12b578d1ecfbcd9805e594cf0ce7cef28c13e4 100644
--- a/NPAnalysis/Template/src/Analysis.cc
+++ b/NPAnalysis/Template/src/Analysis.cc
@@ -17,21 +17,22 @@ int main(int argc, char** argv)
       myOptionManager->SetDetectorFile(name);
    }
 
-   // Instantiate RootOutput
-   RootOutput::getInstance("Analysis/Template_AnalyzedData", "AnalysedTree");
+   
 
    // get input files from NPOptionManager
    string detectorfileName    = myOptionManager->GetDetectorFile();
    string calibrationfileName = myOptionManager->GetCalibrationFile();
    string OutputfileName      = myOptionManager->GetOutputFile();
-
+   
+   // Instantiate RootOutput
+   RootOutput::getInstance("Analysis/"+OutputfileName, "AnalysedTree");
    // Instantiate the Calibration Manger using a file
    CalibrationManager* myCalibration = CalibrationManager::getInstance(calibrationfileName);
    
    // Instantiate the detector using a file
    NPA::DetectorManager* myDetector = new DetectorManager();
    myDetector->ReadConfigurationFile(detectorfileName);
-
+   myCalibration->LoadParameterFromFile();
    // Get the formed Chained Tree and Treat it
    TChain* Chain = RootInput:: getInstance() -> GetChain();