diff --git a/Makefile b/Makefile
index 9e43658..1a717ef 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
-RootInclude=  -I ../../ToolDAQ/root/include
-RootLib=   -L ../../ToolDAQ/root/lib  -lCore -lCint -lRIO -lNet -lHist -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript -lMatrix -lMathCore -lThread -pthread -lm -ldl -rdynamic -pthread -m64
-
+RootInclude = -I $(shell root-config --incdir)
+RootLib = $(shell root-config --libs)
+CXX = $(shell root-config --cxx)
 
 all: 
 
-	g++ -g src/*.cpp UserPlots/*.cpp -o PlotTest -I include -I UserPlots $(RootInclude) $(RootLib)
+	$(CXX) -g src/*.cpp UserPlots/*.cpp -o PlotTest -I include -I UserPlots $(RootInclude) $(RootLib)
 
 clean:
 
-	rm PlotTest
\ No newline at end of file
+	rm PlotTest
diff --git a/UserPlots/ExampleEventDisplay.cpp b/UserPlots/ExampleEventDisplay.cpp
index 823e3c4..2b19118 100644
--- a/UserPlots/ExampleEventDisplay.cpp
+++ b/UserPlots/ExampleEventDisplay.cpp
@@ -49,7 +49,7 @@ bool ExampleEventDisplay::Execute(std::vector<CardData*> *data){
       
       std::stringstream tmp;
       
-      tmp<<outpath<<"EventDisplay.jpg";
+      tmp<<outpath<<"EventDisplay" << std::setfill('0') << std::setw(2) << card << ".png";
       canvas->SaveAs(tmp.str().c_str());
       
     }
diff --git a/UserPlots/ExampleEventDisplay.h b/UserPlots/ExampleEventDisplay.h
index 151c8e1..016fef5 100644
--- a/UserPlots/ExampleEventDisplay.h
+++ b/UserPlots/ExampleEventDisplay.h
@@ -3,6 +3,7 @@
 
 #include <string>
 #include <iostream>
+#include <iomanip>
 #include <Plot.h>
 
 #include <TCanvas.h>