Index: trunk/Makefile
===================================================================
--- trunk/Makefile	(revision 6)
+++ trunk/Makefile	(revision 9)
@@ -92,10 +92,4 @@
 	test/ExRootMain.cpp \
 	ExRootAnalysis/ExRootAnalysis.h
-ExRootMainNew$(ExeSuf): \
-	tmp/test/ExRootMainNew.$(ObjSuf)
-
-tmp/test/ExRootMainNew.$(ObjSuf): \
-	test/ExRootMainNew.cpp \
-	ExRootAnalysis/ExRootAnalysisNew.h
 Example$(ExeSuf): \
 	tmp/test/Example.$(ObjSuf)
@@ -117,4 +111,13 @@
 	ExRootAnalysis/ExRootTreeWriter.h \
 	ExRootAnalysis/ExRootTreeBranch.h \
+	ExRootAnalysis/ExRootUtilities.h \
+	ExRootAnalysis/ExRootProgressBar.h
+ExRootLHCOlympicsWriter$(ExeSuf): \
+	tmp/test/ExRootLHCOlympicsWriter.$(ObjSuf)
+
+tmp/test/ExRootLHCOlympicsWriter.$(ObjSuf): \
+	test/ExRootLHCOlympicsWriter.cpp \
+	ExRootAnalysis/ExRootClasses.h \
+	ExRootAnalysis/ExRootTreeReader.h \
 	ExRootAnalysis/ExRootUtilities.h \
 	ExRootAnalysis/ExRootProgressBar.h
@@ -124,7 +127,7 @@
 	ExRootLHEFConverter$(ExeSuf) \
 	ExRootMain$(ExeSuf) \
-	ExRootMainNew$(ExeSuf) \
 	Example$(ExeSuf) \
-	MatchingTreeConverter$(ExeSuf)
+	MatchingTreeConverter$(ExeSuf) \
+	ExRootLHCOlympicsWriter$(ExeSuf)
 
 EXECUTABLE_OBJ =  \
@@ -133,7 +136,7 @@
 	tmp/test/ExRootLHEFConverter.$(ObjSuf) \
 	tmp/test/ExRootMain.$(ObjSuf) \
-	tmp/test/ExRootMainNew.$(ObjSuf) \
 	tmp/test/Example.$(ObjSuf) \
-	tmp/test/MatchingTreeConverter.$(ObjSuf)
+	tmp/test/MatchingTreeConverter.$(ObjSuf) \
+	tmp/test/ExRootLHCOlympicsWriter.$(ObjSuf)
 
 tmp/src/ExRootAnalysisDict.$(SrcSuf): \
@@ -153,5 +156,4 @@
 	ExRootAnalysis/ExRootConfReader.h \
 	ExRootAnalysis/ExRootEventLoop.h \
-	ExRootAnalysis/ExRootAnalysisNew.h \
 	ExRootAnalysis/ExRootAnalysis.h \
 	ExRootAnalysis/ExRootFactory.h \
@@ -197,13 +199,4 @@
 	src/ExRootAnalysis.$(SrcSuf) \
 	ExRootAnalysis/ExRootAnalysis.h \
-	ExRootAnalysis/ExRootFactory.h \
-	ExRootAnalysis/ExRootConfReader.h \
-	ExRootAnalysis/ExRootTreeReader.h \
-	ExRootAnalysis/ExRootTreeWriter.h \
-	ExRootAnalysis/ExRootUtilities.h \
-	ExRootAnalysis/ExRootProgressBar.h
-tmp/src/ExRootAnalysisNew.$(ObjSuf): \
-	src/ExRootAnalysisNew.$(SrcSuf) \
-	ExRootAnalysis/ExRootAnalysisNew.h \
 	ExRootAnalysis/ExRootFactory.h \
 	ExRootAnalysis/ExRootConfReader.h \
@@ -641,5 +634,4 @@
 SOURCE_OBJ =  \
 	tmp/src/ExRootAnalysis.$(ObjSuf) \
-	tmp/src/ExRootAnalysisNew.$(ObjSuf) \
 	tmp/src/ExRootCandList.$(ObjSuf) \
 	tmp/src/ExRootCandidate.$(ObjSuf) \
@@ -869,8 +861,4 @@
 	tmp/tcl/tclVar.$(ObjSuf)
 
-ExRootAnalysis/ExRootAnalysisNew.h: \
-	ExRootAnalysis/ExRootTask.h
-	@touch $@
-
 CLHEP/Vector/RotationZ.h: \
 	CLHEP/Vector/defs.h \