diff --git a/macros/runCond/deplVandLumiExtrac.C b/macros/runCond/deplVandLumiExtrac.C
index 940a973..917408a 100755
--- a/macros/runCond/deplVandLumiExtrac.C
+++ b/macros/runCond/deplVandLumiExtrac.C
@@ -46,9 +46,18 @@
   
   int argc_copy = argc;
   
-  TApplication theApp("Analysis", &argc, argv,0,-1);
-  argc = theApp.Argc();
-  argv = theApp.Argv();
+  TApplication* theApp = new TApplication("Analysis", &argc, argv,0,-1);
+  argc = theApp->Argc();
+  argv = theApp->Argv();
+
+  bool runBatch = false;
+  
+  for (int i = 1; i<argc; i++) {
+    if (strcmp(argv[i],"-b")==0) {
+      runBatch = true;
+      gROOT->SetBatch();
+    }
+  }
   
   style->SetPadLeftMargin(0.12);
   style->SetPadRightMargin(0.22);
@@ -58,7 +67,9 @@
   int exit = deplVandLumiExtract(argc,argv);
   
   Printf("End");
-  theApp.Run(kTRUE); 
+  if (!runBatch) {
+    theApp->Run(!runBatch);
+  }
   
   return exit;
 }
@@ -91,8 +102,7 @@
   
   
   
-  //const char* homeVar = std::getenv ("HOME");
-  const char* homeVar = "/afs/cern.ch/user/e/egraveri/cmtuser/STMonitoring/STAging";
+  const char* homeVar = std::getenv ("CCEHOME");
   const char* diskVar = std::getenv ("DISK");
   
 
@@ -260,5 +270,5 @@
   Info("deplVandLumiExtract","Results written to %s",fn_flux.Data());
   
   
-  return 0;
-}
\ No newline at end of file
+  return EXIT_SUCCESS;
+}