diff --git a/MatrixElement/FxFx/Makefile.am b/MatrixElement/FxFx/Makefile.am
--- a/MatrixElement/FxFx/Makefile.am
+++ b/MatrixElement/FxFx/Makefile.am
@@ -1,22 +1,15 @@
 pkglib_LTLIBRARIES = HwFxFx.la HwFxFxHandler.la
 HwFxFx_la_SOURCES = \
 FxFxFileReader.cc FxFxFileReader.fh FxFxFileReader.h\
 FxFxEventHandler.cc FxFxEventHandler.h\
 FxFxReader.cc FxFxReader.fh FxFxReader.h\
 FxFx.h
 HwFxFx_la_CPPFLAGS = $(AM_CPPFLAGS) $(FASTJETINCLUDE) -I$(FASTJETPATH)
 HwFxFx_la_LIBADD = $(FASTJETLIBS) 
 HwFxFx_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 1:0:0
 
 HwFxFxHandler_la_SOURCES = \
 FxFxHandler.cc FxFxHandler.h
 HwFxFxHandler_la_CPPFLAGS = $(AM_CPPFLAGS) $(FASTJETINCLUDE) -I$(FASTJETPATH)
 HwFxFxHandler_la_LIBADD = $(FASTJETLIBS) 
 HwFxFxHandler_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 1:0:0
-
-#if HAVE_RIVET 
-#  pkglib_LTLIBRARIES += HwFxFxAnalysis.la
-#  HwFxFxAnalysis_la_SOURCES = \
-#  FxFxAnalysis.cc FxFxAnalysis.h
-#  HwFxFxAnalysis_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 1:0:0
-#endif
diff --git a/src/FxFx-Tree.in b/src/FxFx-Tree.in
deleted file mode 100644
--- a/src/FxFx-Tree.in
+++ /dev/null
@@ -1,173 +0,0 @@
-
-#############################################################
-# Create an event generator taking the default EventGenerator #
-# as the starting point ...                                 #
-#############################################################
-cd /Herwig/Generators
-# Copy the default EventGenerator with its settings to a new 
-# which will be the basis of the one we use for showering: 
-cp EventGenerator theGenerator
-
-#############################################################
-# Create a LH event handler (set up & assigned below) ...   #
-#############################################################
-cd /Herwig/EventHandlers
-library HwFxFx.so
-create Herwig::FxFxEventHandler theLesHouchesHandler
-
-#############################################################
-# Create a LH reader (set up & assigned below) ...          #
-#############################################################
-cd /Herwig/EventHandlers
-library HwFxFx.so
-create Herwig::FxFxFileReader theLHReader
-
-#############################################################
-# Create an FxFxHandler (set up & assigned below) ...     #
-#############################################################
-cd /Herwig/Shower
-library HwFxFxHandler.so
-create Herwig::FxFxHandler FxFxHandler
-set /Herwig/Shower/FxFxHandler:SplittingGenerator /Herwig/Shower/SplittingGenerator
-set /Herwig/Shower/FxFxHandler:KinematicsReconstructor /Herwig/Shower/KinematicsReconstructor
-set /Herwig/Shower/FxFxHandler:PartnerFinder /Herwig/Shower/PartnerFinder
-
-#############################################################
-# Create an LHAPDF (set up & assigned below) ...            #
-#############################################################
-cd /Herwig/Partons
-create ThePEG::LHAPDF thePDFset ThePEGLHAPDF.so
-
-############################################################
-# Create a cuts object ...                                 #
-############################################################
-cd /Herwig/EventHandlers
-create ThePEG::Cuts   /Herwig/Cuts/NoCuts
-
-#############################################################
-# Setup the LH event handler ...                            #
-#############################################################
-cd /Herwig/EventHandlers
-insert theLesHouchesHandler:FxFxReaders[0] theLHReader
-set theLesHouchesHandler:WeightOption VarNegWeight
-set theLesHouchesHandler:PartonExtractor /Herwig/Partons/PPExtractor
-set theLesHouchesHandler:CascadeHandler /Herwig/Shower/FxFxHandler
-set theLesHouchesHandler:HadronizationHandler /Herwig/Hadronization/ClusterHadHandler
-set theLesHouchesHandler:DecayHandler /Herwig/Decays/DecayHandler
-############################################################
-
-##################################################
-#  Shower parameters
-##################################################
-# normally, you want
-# the scale supplied in the event files (SCALUP)
-# to be used as a pT veto scale in the parton shower
-set /Herwig/Shower/ShowerHandler:MaxPtIsMuF Yes
-set /Herwig/Shower/ShowerHandler:RestrictPhasespace Yes
-
-############################################################
-
-#############################################################
-# Set up the LH reader ...                                  #
-#############################################################
-cd /Herwig/EventHandlers
-set theLHReader:WeightWarnings    false
-# Input event file name:
-# 10 k
-set theLHReader:FileName NAME_OF_FILE #(the file can be compressed (gziped,bziped))
-set theLHReader:MomentumTreatment      RescaleEnergy
-set theLHReader:Cuts  /Herwig/Cuts/NoCuts
-
-####################################################
-# Set up the generator ...                         #
-####################################################
-cd /Herwig/Generators
-set theGenerator:EventHandler  /Herwig/EventHandlers/theLesHouchesHandler
-set theGenerator:NumberOfEvents 100000000
-set theGenerator:RandomNumberGenerator:Seed 31122001
-set theGenerator:PrintEvent     1
-set theGenerator:MaxErrors      10000
-
-######################################################### 
-# Option to off shower / hadronization / decays / MPI.  # 
-######################################################### 
-cd /Herwig/EventHandlers 
-# set theLesHouchesHandler:CascadeHandler        NULL 
-#set theLesHouchesHandler:HadronizationHandler  NULL
-# remove the quark check in case hadronization is turned off
-# set /Herwig/Analysis/Basics:CheckQuark false
-#set theLesHouchesHandler:DecayHandler          NULL 
-# The handler for multiple parton interactions 
-#set /Herwig/Shower/FxFxHandler:MPIHandler       NULL
-
-#############################################################
-# Set up the FxFxHandler ...                              #
-#############################################################
-cd /Herwig/Shower
-set /Herwig/Shower/FxFxHandler:MPIHandler  /Herwig/UnderlyingEvent/MPIHandler
-set /Herwig/Shower/FxFxHandler:RemDecayer  /Herwig/Partons/RemnantDecayer
-set /Herwig/Shower/FxFxHandler:ShowerAlpha  AlphaQCD
-# set the heavy quark decay product vetoing process on/off
-set FxFxHandler:HeavyQVeto Yes
-# Automatic detection of the hard process (experimental)
-set FxFxHandler:HardProcessDetection Automatic
-set FxFxHandler:ihrd        3
-# No. of light jets in maximum-multiplicity FxFx process
-set FxFxHandler:njetsmax      1 # Make sure this is set correctly!
-# Mimimum parton-parton R-sep used for generation.
-set FxFxHandler:drjmin      0
-
-######################################################### 
-# Recommended key merging parameters below              # 
-######################################################### 
-cd /Herwig/Shower
-# turn the Vetoing On or Off completely
-set FxFxHandler:VetoIsTurnedOff VetoingIsOn
-# merging mode: in this case Tree level with MG5 information:
-set FxFxHandler:MergeMode TreeMG5
-# merging scale
-set FxFxHandler:ETClus 25*GeV
-# jet radius used in clustering in merging.
-set FxFxHandler:RClus 1.0
-# Max |eta| for jets in clustering in merging.
-set FxFxHandler:EtaClusMax 10
-# Default 1.5 factor used to decide if a jet matches a parton
-# in merging: if DR(parton,jet)<rclusfactor*rclus the parton 
-# and jet are said to have been matched.
-set FxFxHandler:RClusFactor 1.5
-
-######################################################### 
-# Rivet settings and other analyses                     # 
-######################################################### 
-cd /Herwig/Generators
-# Stuff for rivet:
-#create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
-#insert theGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_XS
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 1 ATLAS_2011_I928289_Z
-
-cd /Herwig/Generators
-# Stuff for rivet:
-#create ThePEG::FxFxAnalysis /Herwig/Analysis/FxFxAnalysis FxFxAnalysis.so
-# use the optional weights (WARNING: runs rivet multiple times!)
-#set /Herwig/Analysis/FxFxAnalysis:UseOptWeights No
-#set /Herwig/Analysis/FxFxAnalysis:NormOptWeights Yes # different normalization for weights
-#insert theGenerator:AnalysisHandlers 0 /Herwig/Analysis/FxFxAnalysis
-#insert /Herwig/Analysis/FxFxAnalysis:Analyses 0 MC_XS
-
-
-# A HepMC dump file (requires --with-hepmc to be set at configure time)
-#insert theGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile
-#set /Herwig/Analysis/HepMCFile:PrintEvent 100
-#set /Herwig/Analysis/HepMCFile:Format GenEvent
-#set /Herwig/Analysis/HepMCFile:Units GeV_mm
-
-# set the weight normalization
-#set /Herwig/EventHandlers/theLesHouchesHandler:WeightNormalization CrossSection
-
-################ 
-# Save the run # 
-################ 
-cd /Herwig/Generators
-
-saverun FxFx-Tree theGenerator
diff --git a/src/FxFx.in b/src/FxFx.in
deleted file mode 100644
--- a/src/FxFx.in
+++ /dev/null
@@ -1,185 +0,0 @@
-
-#############################################################
-# Create an event generator taking the default EventGenerator #
-# as the starting point ...                                 #
-#############################################################
-cd /Herwig/Generators
-# Copy the default EventGenerator with its settings to a new 
-# which will be the basis of the one we use for showering: 
-cp EventGenerator theGenerator
-
-#############################################################
-# Create a LH event handler (set up & assigned below) ...   #
-#############################################################
-cd /Herwig/EventHandlers
-library HwFxFx.so
-create Herwig::FxFxEventHandler theLesHouchesHandler
-
-#############################################################
-# Create a LH reader (set up & assigned below) ...          #
-#############################################################
-cd /Herwig/EventHandlers
-#library HwFxFx.so
-create Herwig::FxFxFileReader theLHReader
-
-#############################################################
-# Create an FxFxHandler (set up & assigned below) ...     #
-#############################################################
-cd /Herwig/Shower
-library HwFxFxHandler.so
-create Herwig::FxFxHandler FxFxHandler
-set /Herwig/Shower/FxFxHandler:SplittingGenerator /Herwig/Shower/SplittingGenerator
-set /Herwig/Shower/FxFxHandler:KinematicsReconstructor /Herwig/Shower/KinematicsReconstructor
-set /Herwig/Shower/FxFxHandler:PartnerFinder /Herwig/Shower/PartnerFinder
-
-#############################################################
-# Create an LHAPDF (set up & assigned below) ...            #
-#############################################################
-cd /Herwig/Partons
-create ThePEG::LHAPDF thePDFset ThePEGLHAPDF.so
-
-############################################################
-# Create a cuts object ...                                 #
-############################################################
-cd /Herwig/EventHandlers
-create ThePEG::Cuts   /Herwig/Cuts/NoCuts
-
-#############################################################
-# Setup the LH event handler ...                            #\
-#############################################################
-cd /Herwig/EventHandlers
-insert theLesHouchesHandler:FxFxReaders[0] theLHReader
-set theLesHouchesHandler:WeightOption VarNegWeight
-set theLesHouchesHandler:PartonExtractor /Herwig/Partons/PPExtractor
-set theLesHouchesHandler:CascadeHandler /Herwig/Shower/FxFxHandler
-set theLesHouchesHandler:HadronizationHandler /Herwig/Hadronization/ClusterHadHandler
-set theLesHouchesHandler:DecayHandler /Herwig/Decays/DecayHandler
-
-############################################################
-
-##################################################
-#  Shower parameters
-##################################################
-# normally, you want
-# the scale supplied in the event files (SCALUP)
-# to be used as a pT veto scale in the parton shower
-set /Herwig/Shower/ShowerHandler:MaxPtIsMuF Yes
-set /Herwig/Shower/ShowerHandler:RestrictPhasespace Yes
-# Shower parameters
-# treatment of wide angle radiation
-set /Herwig/Shower/PartnerFinder:PartnerMethod Random
-set /Herwig/Shower/PartnerFinder:ScaleChoice Partner
-# with MC@NLO these parameters are required for consistency of the subtraction terms
-# suggested parameters
-set /Herwig/Shower/KinematicsReconstructor:InitialInitialBoostOption LongTransBoost
-set /Herwig/Shower/KinematicsReconstructor:ReconstructionOption General
-set /Herwig/Shower/KinematicsReconstructor:InitialStateReconOption Rapidity
-set /Herwig/Shower/ShowerHandler:SpinCorrelations No
-
-############################################################
-
-#############################################################
-# Set up the LH reader ...                                  #
-#############################################################
-cd /Herwig/EventHandlers
-set theLHReader:WeightWarnings    false
-# Input event file name:
-# 100 k
-set theLHReader:FileName NAME_OF_FILE #(the file can be compressed (gziped,bziped))
-set theLHReader:MomentumTreatment      RescaleEnergy
-set theLHReader:Cuts  /Herwig/Cuts/NoCuts
-
-####################################################
-# Set up the generator ...                         #
-####################################################
-cd /Herwig/Generators
-set theGenerator:EventHandler  /Herwig/EventHandlers/theLesHouchesHandler
-set theGenerator:NumberOfEvents 100000000
-set theGenerator:RandomNumberGenerator:Seed 31122001
-set theGenerator:PrintEvent     1
-set theGenerator:MaxErrors      10000
-
-######################################################### 
-# Option to off shower / hadronization / decays / MPI.  # 
-######################################################### 
-cd /Herwig/EventHandlers 
-# set theLesHouchesHandler:CascadeHandler        NULL 
-#set theLesHouchesHandler:HadronizationHandler  NULL
-# remove the quark check in case hadronization is turned off
-# set /Herwig/Analysis/Basics:CheckQuark false
-#set theLesHouchesHandler:DecayHandler          NULL 
-# The handler for multiple parton interactions 
-#set /Herwig/Shower/FxFxHandler:MPIHandler       NULL
-
-#############################################################
-# Set up the FxFxHandler ...                              #
-#############################################################
-cd /Herwig/Shower
-set /Herwig/Shower/FxFxHandler:MPIHandler  /Herwig/UnderlyingEvent/MPIHandler
-set /Herwig/Shower/FxFxHandler:RemDecayer  /Herwig/Partons/RemnantDecayer
-set /Herwig/Shower/FxFxHandler:ShowerAlpha  AlphaQCD
-# set the heavy quark decay product vetoing process on/off
-set FxFxHandler:HeavyQVeto Yes
-# Automatic detection of the hard process (experimental)
-set FxFxHandler:HardProcessDetection Automatic
-# No. of light jets in maximum-multiplicity FxFx process
-set FxFxHandler:njetsmax      1 # Make sure this is set correctly!
-# Mimimum parton-parton R-sep used for generation.
-set FxFxHandler:drjmin      0
-
-######################################################### 
-# Recommended key merging parameters below              # 
-######################################################### 
-cd /Herwig/Shower
-# turn the Vetoing On or Off completely
-set FxFxHandler:VetoIsTurnedOff VetoingIsOn
-# merging mode: in this case FxFx:
-set FxFxHandler:MergeMode FxFx
-# merging scale
-set FxFxHandler:ETClus 25*GeV
-# jet radius used in clustering in merging.
-set FxFxHandler:RClus 1.0
-# Max |eta| for jets in clustering in merging.
-set FxFxHandler:EtaClusMax 10
-# Default 1.5 factor used to decide if a jet matches a parton
-# in merging: if DR(parton,jet)<rclusfactor*rclus the parton 
-# and jet are said to have been matched.
-set FxFxHandler:RClusFactor 1.5
-
-######################################################### 
-# Rivet settings and other analyses                     # 
-######################################################### 
-cd /Herwig/Generators
-# Stuff for rivet:
-#create ThePEG::RivetAnalysis /Herwig/Analysis/RivetAnalysis RivetAnalysis.so
-#insert theGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MC_XS
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 1 ATLAS_2017_I1514251
-
-
-cd /Herwig/Generators
-# Stuff for rivet:
-#create ThePEG::FxFxAnalysis /Herwig/Analysis/FxFxAnalysis FxFxAnalysis.so
-# use the optional weights (WARNING: runs rivet multiple times!)
-#set /Herwig/Analysis/FxFxAnalysis:UseOptWeights No
-#set /Herwig/Analysis/FxFxAnalysis:NormOptWeights Yes # different normalization for weights
-#insert theGenerator:AnalysisHandlers 0 /Herwig/Analysis/FxFxAnalysis
-#insert /Herwig/Analysis/FxFxAnalysis:Analyses 0 MC_XS
-#insert /Herwig/Analysis/RivetAnalysis:Analyses 1 ATLAS_2017_I1514251
-
-
-# A HepMC dump file (requires --with-hepmc to be set at configure time)
-#insert theGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile
-#set /Herwig/Analysis/HepMCFile:PrintEvent 100
-#set /Herwig/Analysis/HepMCFile:Format GenEvent
-#set /Herwig/Analysis/HepMCFile:Units GeV_mm
-
-# set the weight normalization
-set /Herwig/EventHandlers/theLesHouchesHandler:WeightNormalization CrossSection
-
-################ 
-# Save the run # 
-################ 
-cd /Herwig/Generators
-
-saverun FxFx theGenerator
diff --git a/src/LHE-FxFx.in b/src/LHE-FxFx.in
new file mode 100644
--- /dev/null
+++ b/src/LHE-FxFx.in
@@ -0,0 +1,150 @@
+##################################################
+# Example generator based on LHC parameters
+# For FxFx merging with MadGraph5/aMC@NLO
+# usage: Herwig read FxFx.in
+##################################################
+#read snippets/PPCollider.in
+##################################################
+# Technical parameters for this run
+##################################################
+cd /Herwig/Generators
+set EventGenerator:NumberOfEvents 100000000
+set EventGenerator:RandomNumberGenerator:Seed 31122001
+set EventGenerator:PrintEvent     1
+set EventGenerator:MaxErrors      10000
+##################################################################
+#   Create the Les Houches file handler and reader for FxFx events
+##################################################################
+cd /Herwig/EventHandlers
+library HwFxFx.so
+create Herwig::FxFxEventHandler LesHouchesHandler
+
+# set the various step handlers
+set LesHouchesHandler:PartonExtractor /Herwig/Partons/PPExtractor
+set LesHouchesHandler:CascadeHandler /Herwig/Shower/FxFxHandler
+set LesHouchesHandler:DecayHandler /Herwig/Decays/DecayHandler
+
+# set the weight option (for MC@NLO)
+set LesHouchesHandler:WeightOption VarNegWeight
+
+# set event hander as one to be used
+set /Herwig/Generators/EventGenerator:EventHandler  /Herwig/EventHandlers/LesHouchesHandler
+
+# Set up an EMPTY CUTS object
+# Normally you will have imposed any cuts you want
+# when generating the event file and don't want any more
+# in particular for POWHEG and MC@NLO you must not apply cuts on the
+# the extra jet
+create ThePEG::Cuts /Herwig/Cuts/NoCuts
+
+# Create a LH reader specialised for FxFx events
+cd /Herwig/EventHandlers
+create Herwig::FxFxFileReader FxFxLHReader
+insert LesHouchesHandler:FxFxReaders[0] FxFxLHReader
+
+# Create the FxFxHandler for merging with the shower	 
+cd /Herwig/Shower
+library HwFxFxHandler.so
+create Herwig::FxFxHandler FxFxHandler
+set /Herwig/Shower/FxFxHandler:SplittingGenerator /Herwig/Shower/SplittingGenerator
+set /Herwig/Shower/FxFxHandler:KinematicsReconstructor /Herwig/Shower/KinematicsReconstructor
+set /Herwig/Shower/FxFxHandler:PartnerFinder /Herwig/Shower/PartnerFinder
+set /Herwig/EventHandlers/LesHouchesHandler:CascadeHandler /Herwig/Shower/FxFxHandler
+
+###################################################################################
+# PDF settings									  #
+# You may wish to use the same PDF as the events were generated with		  #
+###################################################################################
+create ThePEG::LHAPDF /Herwig/Partons/LHAPDF ThePEGLHAPDF.so
+set /Herwig/Partons/LHAPDF:PDFName NAME_OF_PDF
+set /Herwig/Partons/RemnantDecayer:AllowTop Yes
+set /Herwig/Partons/LHAPDF:RemnantHandler /Herwig/Partons/HadronRemnants
+set /Herwig/Particles/p+:PDF /Herwig/Partons/LHAPDF
+set /Herwig/Particles/pbar-:PDF /Herwig/Partons/LHAPDF
+set /Herwig/Partons/PPExtractor:FirstPDF  /Herwig/Partons/LHAPDF
+set /Herwig/Partons/PPExtractor:SecondPDF /Herwig/Partons/LHAPDF
+# We would recommend the shower uses the default PDFs with which it was tuned.
+# However it can be argued that the same set as for the sample should be used for
+# matched samples, i.e. MC@NLO (and less so POWHEG)
+set /Herwig/Shower/ShowerHandler:PDFA /Herwig/Partons/LHAPDF
+set /Herwig/Shower/ShowerHandler:PDFB /Herwig/Partons/LHAPDF
+
+# You can in principle also change the PDFs for the remnant extraction and
+# multiple scattering. As the generator was tuned with the default values
+# this is STRONGLY DISCOURAGED without retuning the MPI parameters
+# create the reader and set cuts
+set /Herwig/EventHandlers/FxFxLHReader:FileName NAME_OF_FILE #(the file can be compressed (gziped,bziped))
+set /Herwig/EventHandlers/FxFxLHReader:WeightWarnings    false
+set /Herwig/EventHandlers/FxFxLHReader:AllowedToReOpen No
+set /Herwig/EventHandlers/FxFxLHReader:InitPDFs 0
+set /Herwig/EventHandlers/FxFxLHReader:Cuts /Herwig/Cuts/NoCuts
+# option to ensure momentum conservation is O.K. due rounding errors (recommended)
+set /Herwig/EventHandlers/FxFxLHReader:MomentumTreatment RescaleEnergy
+# set the pdfs
+set /Herwig/EventHandlers/FxFxLHReader:PDFA /Herwig/Partons/LHAPDF
+set /Herwig/EventHandlers/FxFxLHReader:PDFB /Herwig/Partons/LHAPDF
+# if using BSM models with QNUMBER info
+#set /Herwig/EventHandlers/FxFxLHReader:QNumbers Yes
+#set /Herwig/EventHandlers/FxFxLHReader:Decayer /Herwig/Decays/Mambo
+
+##################################################
+#  Shower parameters				 #
+##################################################
+# normally, especially for POWHEG, you want
+# the scale supplied in the event files (SCALUP)
+# to be used as a pT veto scale in the parton shower
+set /Herwig/Shower/ShowerHandler:MaxPtIsMuF Yes
+set /Herwig/Shower/ShowerHandler:RestrictPhasespace Yes
+# Shower parameters
+# treatment of wide angle radiation
+set /Herwig/Shower/PartnerFinder:PartnerMethod Random
+set /Herwig/Shower/PartnerFinder:ScaleChoice Partner
+# with MC@NLO these parameters are required for consistency of the subtraction terms
+set /Herwig/Shower/KinematicsReconstructor:InitialInitialBoostOption LongTransBoost
+set /Herwig/Shower/KinematicsReconstructor:ReconstructionOption General
+set /Herwig/Shower/KinematicsReconstructor:InitialStateReconOption Rapidity
+set /Herwig/Shower/ShowerHandler:SpinCorrelations No
+
+#############################################################
+# Set up the FxFxHandler			            #
+#############################################################
+cd /Herwig/Shower
+set /Herwig/Shower/FxFxHandler:MPIHandler  /Herwig/UnderlyingEvent/MPIHandler
+set /Herwig/Shower/FxFxHandler:RemDecayer  /Herwig/Partons/RemnantDecayer
+set /Herwig/Shower/FxFxHandler:ShowerAlpha  AlphaQCD
+# set the heavy quark decay product vetoing process on/off
+set FxFxHandler:HeavyQVeto Yes
+# Automatic detection of the hard process (experimental)
+set FxFxHandler:HardProcessDetection Automatic
+# No. of light jets in maximum-multiplicity FxFx process
+set FxFxHandler:njetsmax      MAXIMUM_NUMBER_OF_PARTONS_IN_LHE_FILE # Make sure this is set correctly!
+# Mimimum parton-parton R-sep used for generation.
+set FxFxHandler:drjmin      0
+# Recommended key merging parameters below             
+cd /Herwig/Shower
+# turn the Vetoing On or Off completely
+set FxFxHandler:VetoIsTurnedOff VetoingIsOn
+# merging mode: in this case FxFx:
+set FxFxHandler:MergeMode FxFx
+# merging scale
+set FxFxHandler:ETClus 20*GeV
+# jet radius used in clustering in merging.
+set FxFxHandler:RClus 1.0
+# Max |eta| for jets in clustering in merging.
+set FxFxHandler:EtaClusMax 10
+# Default 1.5 factor used to decide if a jet matches a parton
+# in merging: if DR(parton,jet)<rclusfactor*rclus the parton 
+# and jet are said to have been matched.
+set FxFxHandler:RClusFactor 1.5
+
+##################################################
+# LHC physics parameters (override defaults here) 
+##################################################
+# e.g if different top mass used
+#set /Herwig/Particles/t:NominalMass 173.0
+
+##################################################
+# Save run for later usage with 'Herwig run'
+##################################################
+cd /Herwig/Generators
+saverun LHE-FxFx EventGenerator
diff --git a/src/LHE-MCatNLO.in b/src/LHE-MCatNLO.in
new file mode 100644
--- /dev/null
+++ b/src/LHE-MCatNLO.in
@@ -0,0 +1,112 @@
+##################################################
+# Example generator based on LHC parameters
+# For use with MC@NLO events from MadGraph5/aMC@NLO
+# usage: Herwig read LHE.in
+##################################################
+#read snippets/PPCollider.in
+##################################################
+# Technical parameters for this run
+##################################################
+cd /Herwig/Generators
+set EventGenerator:NumberOfEvents 10000000
+set EventGenerator:RandomNumberGenerator:Seed 31122001
+set EventGenerator:DebugLevel 0
+set EventGenerator:PrintEvent 10
+set EventGenerator:MaxErrors 10000
+##################################################
+#   Create the Les Houches file handler and reader
+##################################################
+cd /Herwig/EventHandlers
+library LesHouches.so
+# create the event handler
+create ThePEG::LesHouchesEventHandler LesHouchesHandler
+
+# set the various step handlers
+set LesHouchesHandler:PartonExtractor /Herwig/Partons/PPExtractor
+set LesHouchesHandler:CascadeHandler /Herwig/Shower/ShowerHandler
+set LesHouchesHandler:DecayHandler /Herwig/Decays/DecayHandler
+set LesHouchesHandler:HadronizationHandler /Herwig/Hadronization/ClusterHadHandler
+
+# set the weight option
+set LesHouchesHandler:WeightOption VarNegWeight
+
+# set event hander as one to be used
+set /Herwig/Generators/EventGenerator:EventHandler /Herwig/EventHandlers/LesHouchesHandler
+
+# Set up an EMPTY CUTS object
+# Normally you will have imposed any cuts you want
+# when generating the event file and don't want any more
+# in particular for POWHEG and MC@NLO you must not apply cuts on the
+# the extra jet
+create ThePEG::Cuts /Herwig/Cuts/NoCuts
+
+####################################################################
+# PDF settings #
+####################################################################
+# You may wish to use the same PDF as the events were generated with
+create ThePEG::LHAPDF /Herwig/Partons/LHAPDF ThePEGLHAPDF.so
+set /Herwig/Partons/LHAPDF:PDFName NAME_OF_PDF
+set /Herwig/Partons/RemnantDecayer:AllowTop Yes
+set /Herwig/Partons/LHAPDF:RemnantHandler /Herwig/Partons/HadronRemnants
+set /Herwig/Particles/p+:PDF /Herwig/Partons/LHAPDF
+set /Herwig/Particles/pbar-:PDF /Herwig/Partons/LHAPDF
+set /Herwig/Partons/PPExtractor:FirstPDF  /Herwig/Partons/LHAPDF
+set /Herwig/Partons/PPExtractor:SecondPDF /Herwig/Partons/LHAPDF
+
+# We would recommend the shower uses the default PDFs with which it was tuned.
+# However it can be argued that the same set as for the sample should be used for
+# matched samples, i.e. MC@NLO (and less so POWHEG)
+#set /Herwig/Shower/ShowerHandler:PDFA /Herwig/Partons/LHAPDF
+#set /Herwig/Shower/ShowerHandler:PDFB /Herwig/Partons/LHAPDF
+
+# You can in principle also change the PDFs for the remnant extraction and
+# multiple scattering. As the generator was tuned with the default values
+# this is STRONGLY DISCOURAGED without retuning the MPI parameters
+# create the reader and set cuts
+create ThePEG::LesHouchesFileReader LesHouchesReader
+set LesHouchesReader:FileName NAME_OF_FILE #(the file can be compressed (gziped,bziped))
+set LesHouchesReader:AllowedToReOpen No
+set LesHouchesReader:InitPDFs 0
+set LesHouchesReader:Cuts /Herwig/Cuts/NoCuts
+
+# option to ensure momentum conservation is O.K. due rounding errors (recommended)
+set LesHouchesReader:MomentumTreatment RescaleEnergy
+# set the pdfs
+set LesHouchesReader:PDFA /Herwig/Partons/LHAPDF
+set LesHouchesReader:PDFB /Herwig/Partons/LHAPDF
+# if using BSM models with QNUMBER info
+#set LesHouchesReader:QNumbers Yes
+#set LesHouchesReader:Decayer /Herwig/Decays/Mambo
+# and add to handler
+insert LesHouchesHandler:LesHouchesReaders 0 LesHouchesReader
+
+##################################################
+#  Shower parameters
+##################################################
+# normally, especially for POWHEG, you want
+# the scale supplied in the event files (SCALUP)
+# to be used as a pT veto scale in the parton shower
+set /Herwig/Shower/ShowerHandler:MaxPtIsMuF Yes
+set /Herwig/Shower/ShowerHandler:RestrictPhasespace Yes
+# Shower parameters
+# treatment of wide angle radiation
+set /Herwig/Shower/PartnerFinder:PartnerMethod Random
+set /Herwig/Shower/PartnerFinder:ScaleChoice Partner
+# with MC@NLO these parameters are required for consistency of the subtraction terms
+# suggested parameters (give worse physics results with POWHEG)
+set /Herwig/Shower/KinematicsReconstructor:InitialInitialBoostOption LongTransBoost
+set /Herwig/Shower/KinematicsReconstructor:ReconstructionOption General
+set /Herwig/Shower/KinematicsReconstructor:InitialStateReconOption Rapidity
+set /Herwig/Shower/ShowerHandler:SpinCorrelations No
+
+##################################################
+# LHC physics parameters (override defaults here) 
+##################################################
+# e.g if different top mass used
+#set /Herwig/Particles/t:NominalMass 173.0
+
+##################################################
+# Save run for later usage with 'Herwig run'
+##################################################
+cd /Herwig/Generators
+saverun LHE-MCatNLO EventGenerator
diff --git a/src/LHE-MGMerging.in b/src/LHE-MGMerging.in
new file mode 100644
--- /dev/null
+++ b/src/LHE-MGMerging.in
@@ -0,0 +1,154 @@
+##################################################
+# Example generator based on LHC parameters
+# For FxFx merging with MadGraph5/aMC@NLO
+# usage: Herwig read FxFx.in
+##################################################
+#read snippets/PPCollider.in
+##################################################
+# Technical parameters for this run
+##################################################
+cd /Herwig/Generators
+set EventGenerator:NumberOfEvents 100000000
+set EventGenerator:RandomNumberGenerator:Seed 31122001
+set EventGenerator:PrintEvent     1
+set EventGenerator:MaxErrors      10000
+##################################################################
+#   Create the Les Houches file handler and reader for FxFx events
+##################################################################
+cd /Herwig/EventHandlers
+library HwFxFx.so
+create Herwig::FxFxEventHandler LesHouchesHandler
+
+# set the various step handlers
+set LesHouchesHandler:PartonExtractor /Herwig/Partons/PPExtractor
+set LesHouchesHandler:CascadeHandler /Herwig/Shower/FxFxHandler
+set LesHouchesHandler:DecayHandler /Herwig/Decays/DecayHandler
+
+# set the weight option (for MC@NLO)
+set LesHouchesHandler:WeightOption VarNegWeight
+
+# set event hander as one to be used
+set /Herwig/Generators/EventGenerator:EventHandler  /Herwig/EventHandlers/LesHouchesHandler
+
+# Set up an EMPTY CUTS object
+# Normally you will have imposed any cuts you want
+# when generating the event file and don't want any more
+# in particular for POWHEG and MC@NLO you must not apply cuts on the
+# the extra jet
+create ThePEG::Cuts /Herwig/Cuts/NoCuts
+
+# Create a LH reader specialised for FxFx events
+cd /Herwig/EventHandlers
+create Herwig::FxFxFileReader FxFxLHReader
+insert LesHouchesHandler:FxFxReaders[0] FxFxLHReader
+
+# Create the FxFxHandler for merging with the shower	 
+cd /Herwig/Shower
+library HwFxFxHandler.so
+create Herwig::FxFxHandler FxFxHandler
+set /Herwig/Shower/FxFxHandler:SplittingGenerator /Herwig/Shower/SplittingGenerator
+set /Herwig/Shower/FxFxHandler:KinematicsReconstructor /Herwig/Shower/KinematicsReconstructor
+set /Herwig/Shower/FxFxHandler:PartnerFinder /Herwig/Shower/PartnerFinder
+set /Herwig/EventHandlers/LesHouchesHandler:CascadeHandler /Herwig/Shower/FxFxHandler
+
+###################################################################################
+# PDF settings									  #
+# You may wish to use the same PDF as the events were generated with		  #
+###################################################################################
+create ThePEG::LHAPDF /Herwig/Partons/LHAPDF ThePEGLHAPDF.so
+set /Herwig/Partons/LHAPDF:PDFName NAME_OF_PDF
+set /Herwig/Partons/RemnantDecayer:AllowTop Yes
+set /Herwig/Partons/LHAPDF:RemnantHandler /Herwig/Partons/HadronRemnants
+set /Herwig/Particles/p+:PDF /Herwig/Partons/LHAPDF
+set /Herwig/Particles/pbar-:PDF /Herwig/Partons/LHAPDF
+set /Herwig/Partons/PPExtractor:FirstPDF  /Herwig/Partons/LHAPDF
+set /Herwig/Partons/PPExtractor:SecondPDF /Herwig/Partons/LHAPDF
+# We would recommend the shower uses the default PDFs with which it was tuned.
+# However it can be argued that the same set as for the sample should be used for
+# matched samples, i.e. MC@NLO (and less so POWHEG)
+set /Herwig/Shower/ShowerHandler:PDFA /Herwig/Partons/LHAPDF
+set /Herwig/Shower/ShowerHandler:PDFB /Herwig/Partons/LHAPDF
+
+# You can in principle also change the PDFs for the remnant extraction and
+# multiple scattering. As the generator was tuned with the default values
+# this is STRONGLY DISCOURAGED without retuning the MPI parameters
+# create the reader and set cuts
+set /Herwig/EventHandlers/FxFxLHReader:FileName NAME_OF_FILE #(the file can be compressed (gziped,bziped))
+set /Herwig/EventHandlers/FxFxLHReader:WeightWarnings    false
+set /Herwig/EventHandlers/FxFxLHReader:AllowedToReOpen No
+set /Herwig/EventHandlers/FxFxLHReader:InitPDFs 0
+set /Herwig/EventHandlers/FxFxLHReader:Cuts /Herwig/Cuts/NoCuts
+# option to ensure momentum conservation is O.K. due rounding errors (recommended)
+set /Herwig/EventHandlers/FxFxLHReader:MomentumTreatment RescaleEnergy
+# set the pdfs
+set /Herwig/EventHandlers/FxFxLHReader:PDFA /Herwig/Partons/LHAPDF
+set /Herwig/EventHandlers/FxFxLHReader:PDFB /Herwig/Partons/LHAPDF
+# if using BSM models with QNUMBER info
+#set /Herwig/EventHandlers/FxFxLHReader:QNumbers Yes
+#set /Herwig/EventHandlers/FxFxLHReader:Decayer /Herwig/Decays/Mambo
+
+
+##################################################
+#  Shower parameters				 #
+##################################################
+# normally, especially for POWHEG, you want
+# the scale supplied in the event files (SCALUP)
+# to be used as a pT veto scale in the parton shower
+set /Herwig/Shower/ShowerHandler:MaxPtIsMuF Yes
+set /Herwig/Shower/ShowerHandler:RestrictPhasespace Yes
+# Shower parameters
+# treatment of wide angle radiation
+set /Herwig/Shower/PartnerFinder:PartnerMethod Random
+set /Herwig/Shower/PartnerFinder:ScaleChoice Partner
+# with MC@NLO these parameters are required for consistency of the subtraction terms
+set /Herwig/Shower/KinematicsReconstructor:InitialInitialBoostOption LongTransBoost
+set /Herwig/Shower/KinematicsReconstructor:ReconstructionOption General
+set /Herwig/Shower/KinematicsReconstructor:InitialStateReconOption Rapidity
+set /Herwig/Shower/ShowerHandler:SpinCorrelations No
+
+#############################################################
+# Set up the FxFxHandler			            #
+#############################################################
+cd /Herwig/Shower
+set /Herwig/Shower/FxFxHandler:MPIHandler  /Herwig/UnderlyingEvent/MPIHandler
+set /Herwig/Shower/FxFxHandler:RemDecayer  /Herwig/Partons/RemnantDecayer
+set /Herwig/Shower/FxFxHandler:ShowerAlpha  AlphaQCD
+# set the heavy quark decay product vetoing process on/off
+set FxFxHandler:HeavyQVeto Yes
+# Automatic detection of the hard process (experimental)
+set FxFxHandler:HardProcessDetection Automatic
+# Choose the hard process manually according to AlpGen codes (see hep-ph/0206293)
+# and set HardProcessDetection to Manual
+# set FxFxHandler:ihrd        3 # 3 corresponds to W+jets or Z+jets
+# No. of light jets in maximum-multiplicity process
+set FxFxHandler:njetsmax      MAXIMUM_NUMBER_OF_PARTONS_IN_LHE_FILE # Make sure this is set correctly!
+# Mimimum parton-parton R-sep used for generation.
+set FxFxHandler:drjmin      0
+# Recommended key merging parameters below             
+cd /Herwig/Shower
+# turn the Vetoing On or Off completely
+set FxFxHandler:VetoIsTurnedOff VetoingIsOn
+# merging mode: in this case Tree level with MG5 information:
+set FxFxHandler:MergeMode TreeMG5
+# merging scale
+set FxFxHandler:ETClus 25*GeV
+# jet radius used in clustering in merging.
+set FxFxHandler:RClus 1.0
+# Max |eta| for jets in clustering in merging.
+set FxFxHandler:EtaClusMax 10
+# Default 1.5 factor used to decide if a jet matches a parton
+# in merging: if DR(parton,jet)<rclusfactor*rclus the parton 
+# and jet are said to have been matched.
+set FxFxHandler:RClusFactor 1.5
+
+##################################################
+# LHC physics parameters (override defaults here) 
+##################################################
+# e.g if different top mass used
+#set /Herwig/Particles/t:NominalMass 173.0
+
+##################################################
+# Save run for later usage with 'Herwig run'
+##################################################
+cd /Herwig/Generators
+saverun LHE-MGMerging EventGenerator
diff --git a/src/LHE-POWHEG.in b/src/LHE-POWHEG.in
new file mode 100644
--- /dev/null
+++ b/src/LHE-POWHEG.in
@@ -0,0 +1,106 @@
+##################################################
+# Example generator based on LHC parameters
+# For use with POWHEG events
+# usage: Herwig read LHE.in
+##################################################
+#read snippets/PPCollider.in
+##################################################
+# Technical parameters for this run
+##################################################
+cd /Herwig/Generators
+set EventGenerator:NumberOfEvents 10000000
+set EventGenerator:RandomNumberGenerator:Seed 31122001
+set EventGenerator:DebugLevel 0
+set EventGenerator:PrintEvent 10
+set EventGenerator:MaxErrors 10000
+##################################################
+#   Create the Les Houches file handler and reader
+##################################################
+cd /Herwig/EventHandlers
+library LesHouches.so
+# create the event handler
+create ThePEG::LesHouchesEventHandler LesHouchesHandler
+
+# set the various step handlers
+set LesHouchesHandler:PartonExtractor /Herwig/Partons/PPExtractor
+set LesHouchesHandler:CascadeHandler /Herwig/Shower/ShowerHandler
+set LesHouchesHandler:DecayHandler /Herwig/Decays/DecayHandler
+set LesHouchesHandler:HadronizationHandler /Herwig/Hadronization/ClusterHadHandler
+
+# set the weight option 
+set LesHouchesHandler:WeightOption VarNegWeight
+
+# set event hander as one to be used
+set /Herwig/Generators/EventGenerator:EventHandler /Herwig/EventHandlers/LesHouchesHandler
+
+# Set up an EMPTY CUTS object
+# Normally you will have imposed any cuts you want
+# when generating the event file and don't want any more
+# in particular for POWHEG and MC@NLO you must not apply cuts on the
+# the extra jet
+create ThePEG::Cuts /Herwig/Cuts/NoCuts
+
+####################################################################
+# PDF settings #
+####################################################################
+# You may wish to use the same PDF as the events were generated with
+create ThePEG::LHAPDF /Herwig/Partons/LHAPDF ThePEGLHAPDF.so
+set /Herwig/Partons/LHAPDF:PDFName NAME_OF_PDF
+set /Herwig/Partons/RemnantDecayer:AllowTop Yes
+set /Herwig/Partons/LHAPDF:RemnantHandler /Herwig/Partons/HadronRemnants
+set /Herwig/Particles/p+:PDF /Herwig/Partons/LHAPDF
+set /Herwig/Particles/pbar-:PDF /Herwig/Partons/LHAPDF
+set /Herwig/Partons/PPExtractor:FirstPDF  /Herwig/Partons/LHAPDF
+set /Herwig/Partons/PPExtractor:SecondPDF /Herwig/Partons/LHAPDF
+
+# We would recommend the shower uses the default PDFs with which it was tuned.
+# However it can be argued that the same set as for the sample should be used for
+# matched samples, i.e. MC@NLO (and less so POWHEG)
+#set /Herwig/Shower/ShowerHandler:PDFA /Herwig/Partons/LHAPDF
+#set /Herwig/Shower/ShowerHandler:PDFB /Herwig/Partons/LHAPDF
+
+# You can in principle also change the PDFs for the remnant extraction and
+# multiple scattering. As the generator was tuned with the default values
+# this is STRONGLY DISCOURAGED without retuning the MPI parameters
+# create the reader and set cuts
+create ThePEG::LesHouchesFileReader LesHouchesReader
+set LesHouchesReader:FileName NAME_OF_FILE #(the file can be compressed (gziped,bziped))
+set LesHouchesReader:AllowedToReOpen No
+set LesHouchesReader:InitPDFs 0
+set LesHouchesReader:Cuts /Herwig/Cuts/NoCuts
+
+# option to ensure momentum conservation is O.K. due rounding errors (recommended)
+set LesHouchesReader:MomentumTreatment RescaleEnergy
+# set the pdfs
+set LesHouchesReader:PDFA /Herwig/Partons/LHAPDF
+set LesHouchesReader:PDFB /Herwig/Partons/LHAPDF
+# if using BSM models with QNUMBER info
+#set LesHouchesReader:QNumbers Yes
+#set LesHouchesReader:Decayer /Herwig/Decays/Mambo
+# and add to handler
+insert LesHouchesHandler:LesHouchesReaders 0 LesHouchesReader
+
+##################################################
+#  Shower parameters
+##################################################
+# normally, especially for POWHEG, you want
+# the scale supplied in the event files (SCALUP)
+# to be used as a pT veto scale in the parton shower
+set /Herwig/Shower/ShowerHandler:MaxPtIsMuF Yes
+set /Herwig/Shower/ShowerHandler:RestrictPhasespace Yes
+# Shower parameters
+# treatment of wide angle radiation
+set /Herwig/Shower/PartnerFinder:PartnerMethod Random
+set /Herwig/Shower/PartnerFinder:ScaleChoice Partner
+
+##################################################
+# LHC physics parameters (override defaults here) 
+##################################################
+# e.g if different top mass used
+#set /Herwig/Particles/t:NominalMass 173.0
+
+##################################################
+# Save run for later usage with 'Herwig run'
+##################################################
+cd /Herwig/Generators
+saverun LHE EventGenerator
diff --git a/src/LHE.in b/src/LHE.in
--- a/src/LHE.in
+++ b/src/LHE.in
@@ -1,96 +1,117 @@
 ##################################################
 # Example generator based on LHC parameters
+# Generic Les Houches Event file input
+# Look at customised input files for:
+# MadGraph5/aMC@NLO: LHE-MCatNLO.in
+# POWHEG:	     LHE-POWHEG.in
+# FxFx merging with MG5/aMC@NLO: LHE-FxFx.in
+# Tree-level merging with MG5/aMC@NLO: LHE-MGMerging.in
 # usage: Herwig read LHE.in
 ##################################################
-read snippets/PPCollider.in
+#read snippets/PPCollider.in
 ##################################################
 # Technical parameters for this run
 ##################################################
 cd /Herwig/Generators
 set EventGenerator:NumberOfEvents 10000000
 set EventGenerator:RandomNumberGenerator:Seed 31122001
 set EventGenerator:DebugLevel 0
 set EventGenerator:PrintEvent 10
 set EventGenerator:MaxErrors 10000
 ##################################################
 #   Create the Les Houches file handler and reader
 ##################################################
 cd /Herwig/EventHandlers
 library LesHouches.so
 # create the event handler
 create ThePEG::LesHouchesEventHandler LesHouchesHandler
+
 # set the various step handlers
 set LesHouchesHandler:PartonExtractor /Herwig/Partons/PPExtractor
 set LesHouchesHandler:CascadeHandler /Herwig/Shower/ShowerHandler
 set LesHouchesHandler:DecayHandler /Herwig/Decays/DecayHandler
 set LesHouchesHandler:HadronizationHandler /Herwig/Hadronization/ClusterHadHandler
+
 # set the weight option (e.g. for MC@NLO)
 set LesHouchesHandler:WeightOption VarNegWeight
+
 # set event hander as one to be used
 set /Herwig/Generators/EventGenerator:EventHandler /Herwig/EventHandlers/LesHouchesHandler
+
 # Set up an EMPTY CUTS object
 # Normally you will have imposed any cuts you want
 # when generating the event file and don't want any more
 # in particular for POWHEG and MC@NLO you must not apply cuts on the
 # the extra jet
 create ThePEG::Cuts /Herwig/Cuts/NoCuts
+
+####################################################################
+# PDF settings #
+####################################################################
 # You may wish to use the same PDF as the events were generated with
 create ThePEG::LHAPDF /Herwig/Partons/LHAPDF ThePEGLHAPDF.so
 set /Herwig/Partons/LHAPDF:PDFName NAME_OF_PDF
+set /Herwig/Partons/RemnantDecayer:AllowTop Yes
 set /Herwig/Partons/LHAPDF:RemnantHandler /Herwig/Partons/HadronRemnants
 set /Herwig/Particles/p+:PDF /Herwig/Partons/LHAPDF
 set /Herwig/Particles/pbar-:PDF /Herwig/Partons/LHAPDF
 set /Herwig/Partons/PPExtractor:FirstPDF  /Herwig/Partons/LHAPDF
 set /Herwig/Partons/PPExtractor:SecondPDF /Herwig/Partons/LHAPDF
+
 # We would recommend the shower uses the default PDFs with which it was tuned.
 # However it can be argued that the same set as for the sample should be used for
 # matched samples, i.e. MC@NLO (and less so POWHEG)
 #set /Herwig/Shower/ShowerHandler:PDFA /Herwig/Partons/LHAPDF
 #set /Herwig/Shower/ShowerHandler:PDFB /Herwig/Partons/LHAPDF
+
 # You can in principle also change the PDFs for the remnant extraction and
 # multiple scattering. As the generator was tuned with the default values
 # this is STRONGLY DISCOURAGED without retuning the MPI parameters
 # create the reader and set cuts
 create ThePEG::LesHouchesFileReader LesHouchesReader
 set LesHouchesReader:FileName NAME_OF_FILE #(the file can be compressed (gziped,bziped))
 set LesHouchesReader:AllowedToReOpen No
 set LesHouchesReader:InitPDFs 0
 set LesHouchesReader:Cuts /Herwig/Cuts/NoCuts
+
 # option to ensure momentum conservation is O.K. due rounding errors (recommended)
 set LesHouchesReader:MomentumTreatment RescaleEnergy
 # set the pdfs
 set LesHouchesReader:PDFA /Herwig/Partons/LHAPDF
 set LesHouchesReader:PDFB /Herwig/Partons/LHAPDF
 # if using BSM models with QNUMBER info
 #set LesHouchesReader:QNumbers Yes
 #set LesHouchesReader:Decayer /Herwig/Decays/Mambo
 # and add to handler
 insert LesHouchesHandler:LesHouchesReaders 0 LesHouchesReader
+
 ##################################################
 #  Shower parameters
 ##################################################
 # normally, especially for POWHEG, you want
 # the scale supplied in the event files (SCALUP)
 # to be used as a pT veto scale in the parton shower
 set /Herwig/Shower/ShowerHandler:MaxPtIsMuF Yes
 set /Herwig/Shower/ShowerHandler:RestrictPhasespace Yes
 # Shower parameters
 # treatment of wide angle radiation
 set /Herwig/Shower/PartnerFinder:PartnerMethod Random
 set /Herwig/Shower/PartnerFinder:ScaleChoice Partner
 # with MC@NLO these parameters are required for consistency of the subtraction terms
 # suggested parameters (give worse physics results with POWHEG)
 #set /Herwig/Shower/KinematicsReconstructor:InitialInitialBoostOption LongTransBoost
 #set /Herwig/Shower/KinematicsReconstructor:ReconstructionOption General
 #set /Herwig/Shower/KinematicsReconstructor:InitialStateReconOption Rapidity
 #set /Herwig/Shower/ShowerHandler:SpinCorrelations No
+
 ##################################################
 # LHC physics parameters (override defaults here) 
 ##################################################
 # e.g if different top mass used
 #set /Herwig/Particles/t:NominalMass 173.0
+
 ##################################################
 # Save run for later usage with 'Herwig run'
 ##################################################
 cd /Herwig/Generators
 saverun LHE EventGenerator
diff --git a/src/Makefile.am b/src/Makefile.am
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,228 +1,230 @@
 SUBDIRS = defaults snippets Matchbox Merging
 
 defaultsdir = ${pkgdatadir}/defaults
 
 bin_PROGRAMS = Herwig
 
 Herwig_SOURCES = \
 HerwigMain.cc HerwigCLI.cc HerwigCLI.h \
 herwigopts.c herwigopts.h
 
 BUILT_SOURCES = herwigopts.c herwigopts.h
 
 Herwig_LDFLAGS = $(AM_LDFLAGS) -export-dynamic $(THEPEGLDFLAGS)
 Herwig_LDADD = $(THEPEGLIB) -ldl \
 $(top_builddir)/API/libHerwigAPI.la
 
 bin_SCRIPTS = herwig-config
 
 HELPERFILES = \
 CMSSM40.1.1.slha \
 NMSSM.spc \
 ADD.model \
 Leptoquark.model \
 LH.model \
 LHTP.model \
 MSSM.model \
 MUED.model \
 NMSSM.model \
 RPV-Bi.model \
 RPV-Tri.model \
 RS.model \
 Sextet.model \
 TTBA.model \
 Zprime.model \
 RPV-BI.slha \
 RPV-TRI.slha \
 RPV-UDD.slha
 
 INPUTFILES = \
 DIS.in \
 DIS-Matchbox.in \
 GammaGamma.in \
 ILC.in \
 ILC-MSSM.in \
 ILC-MUED.in \
 ILC-RS.in \
 LEP.in \
 LEP-Matchbox.in \
 LHC-ADD.in \
 LHC-CEX.in \
 LHC-GammaGamma.in \
 LHC-ResolvedGammaGamma.in \
 LHC.in \
 LHC-Matchbox.in \
 LHC-LQ.in \
 LHC-MSSM.in \
 LHC-MUED.in \
 LHC-NMSSM.in \
 LHC-Powheg.in \
 LHC-RPV.in \
 LHC-RS.in \
 LHC-Sextet.in \
 LHC-TRP.in \
 LHC-TTBA.in \
 LHC-MB.in \
 LHC-ZP.in \
 TVT.in \
 TVT-Powheg.in \
 TVT-TTBA.in \
 LHC-LH.in \
 LHC-LHTP.in \
 LHE.in \
-FxFx.in\
-FxFx-Tree.in
+LHE-POWHEG.in \
+LHE-MCatNLO.in \
+LHE-FxFx.in \
+LHE-MGMerging.in
 
 dist_pkgdata_DATA = $(INPUTFILES) $(HELPERFILES)
 pkgdata_DATA = Makefile-UserModules
 
 CLEANFILES = HerwigDefaults.rpo \
   *.run *.log *.out *.tex \
   multi.test *.output probs.test chisq.value \
   LHC-RS-BR.spc LHC-MSSM-BR.spc LHC-RPV-BR.spc
 
 clean-local:
 	-rm -rf Herwig
 
 ## checking targets ##
 
 HerwigDefaults.rpo: Herwig $(srcdir)/defaults/*.in defaults/PDF.in defaults/Analysis.in $(top_builddir)/lib/*.so
 	./Herwig init -L$(top_builddir)/lib defaults/HerwigDefaults.in -D
 
 check_BSM_Full=
 check_BSM=
 
 if WANT_BSM
 
 check_BSM += check-LHC-RPV check-LHC-RS
 
 check_BSM_Full += \
 check-LHC-RPV check-LHC-MSSM check-ILC-MSSM \
 check-LHC-NMSSM \
 check-LHC-MUED check-ILC-MUED \
 check-LHC-RS check-ILC-RS check-LHC-ADD \
 check-LHC-LH check-LHC-LHTP \
 check-LHC-TRP \
 check-LHC-TTBA check-TVT-TTBA \
 check-LHC-ZP \
 check-LHC-LQ \
 check-LHC-Sextet
 
 endif
 check_BSM_Full_valgrind = $(subst check,check-valgrind,$(check_BSM_Full))
 check_BSM_valgrind = $(subst check,check-valgrind,$(check_BSM))
 
 check-local: check-LEP check-LHC $(check_BSM) check-DIS check-ILC check-GammaGamma check-LHC-Powheg
 
 check-valgrind-local: check-valgrind-LEP check-valgrind-LHC $(check_BSM_valgrind) check-valgrind-DIS check-valgrind-ILC check-valgrind-GammaGamma check-valgrind-LHC-Powheg
 
 check-Powheg: check-LHC-Powheg check-TVT-Powheg
 
 check-valgrind-Powheg: check-valgrind-LHC-Powheg check-valgrind-TVT-Powheg
 
 check-BSM: $(check_BSM_Full)
 
 check-valgrind-BSM: $(check_BSM_Full_valgrind)
 
 check_Matchbox= \
 check-LEP-Matchbox check-DIS-Matchbox check-LHC-Matchbox
 check_Matchbox_valgrind = $(subst check,check-valgrind,$(check_Matchbox))
 
 check-Matchbox: $(check_Matchbox)
 
 check-valgrind-Matchbox: $(check_Matchbox_valgrind)
 
 check-extra: check-LHC-CEX check-LHC-GammaGamma check-LHC-ResolvedGammaGamma check-LHC-MB check-TVT
 
 check-valgrind-extra: check-valgrind-LHC-CEX check-valgrind-LHC-GammaGamma check-valgrind-LHC-MB check-valgrind-TVT
 
 check-all: check-local check-Powheg check-BSM check-Matchbox check-extra
 
 check-valgrind-all: check-valgrind-local check-valgrind-Powheg check-valgrind-BSM check-valgrind-Matchbox check-valgrind-extra
 
 link-helper-files:
 	@for i in $(HELPERFILES); do \
 	if test -f $(srcdir)/$$i -a ! -e $$i; then \
 	$(LN_S) -f $(srcdir)/$$i; fi; done
 
 ## valgrind targets ##
 
 VALGRIND=valgrind --leak-check=full --num-callers=25 --freelist-vol=100000000 --leak-resolution=med --trace-children=yes
 
 check-valgrind-%: $(srcdir)/%.in HerwigDefaults.rpo link-helper-files
 	$(VALGRIND) ./Herwig read -d1 -D $< &> valgrind-$(notdir $(subst .in,,$<))-read.log
 	$(VALGRIND) ./Herwig run $(notdir $(subst .in,.run,$<)) -N 500 -d1 -D &> valgrind-$(notdir $(subst .in,,$<))-run.log
 
 valgrind: valgrind-init valgrind-read valgrind-run
 
 valgrind-init:
 	$(VALGRIND) ./Herwig init -d1 -D -L$(top_builddir)/lib defaults/HerwigDefaults.in \
 &> /tmp/valgrind-init.log
 valgrind-read:
 	$(VALGRIND) ./Herwig read -d1 -D LHC.in &> /tmp/valgrind-read.log
 valgrind-run:
 	$(VALGRIND) ./Herwig run -d1 -D -N5 LHC.run &> /tmp/valgrind-run.log
 
 CHECKCOMMAND = ./Herwig run  $(notdir $(subst .in,.run,$<)) -N500 -d1 -D
 
 check-%: $(srcdir)/%.in HerwigDefaults.rpo link-helper-files
 	./Herwig read -i . $< -D
 	@echo $(CHECKCOMMAND)
 	@$(CHECKCOMMAND) && echo "# $@ OK #" \
 			 || (echo "###### $@ BAD ######"; false)
 SETUPTHEPEG=$(THEPEGPATH)/bin/setupThePEG
 THEPEGREPO=$(THEPEGLIBPATH)/ThePEGDefaults.rpo
 
 install-data-hook:
 	@echo Creating repository
 	@./Herwig init -L$(DESTDIR)$(pkglibdir) -i$(DESTDIR)$(pkgdatadir) -i$(DESTDIR)$(pkgdatadir)/snippets $(DESTDIR)$(defaultsdir)/HerwigDefaults.in --repo=$(DESTDIR)$(pkgdatadir)/HerwigDefaults.rpo
 	@if test -n "$(DESTDIR)"; \
         then sed -i.bak -e "s@$(DESTDIR)@@g" $(DESTDIR)$(pkgdatadir)/HerwigDefaults.rpo; \
 	rm -f $(DESTDIR)$(pkgdatadir)/HerwigDefaults.rpo.bak; \
         fi
 
 uninstall-hook:
 	rm -f $(DESTDIR)$(pkgdatadir)/HerwigDefaults.rpo
 
 
 register: register-with-thepeg-repo
 register-with-thepeg-repo:
 	@if test -x "$(SETUPTHEPEG)" -a -w "$(THEPEGREPO)"; \
 		then echo Registering with ThePEG; \
 		"$(SETUPTHEPEG)" --init \
 		$(DESTDIR)$(defaultsdir)/HerwigDefaults.in \
 		-r "$(THEPEGREPO)" -o "$(THEPEGREPO)" \
 		-i $(DESTDIR)$(pkgdatadir) \
 		-l$(DESTDIR)$(pkglibdir) ; \
 		if test -n "$(DESTDIR)"; \
 		then sed -i -e "s@$(DESTDIR)@@g" "$(THEPEGREPO)" ; fi ; \
 	fi
 
 
 unregister : unregister-from-thepeg-repo
 unregister-from-thepeg-repo:
 	@if test -x "$(SETUPTHEPEG)" -a -w "$(THEPEGREPO)"; \
 		then echo Unregistering with ThePEG; \
 		"$(SETUPTHEPEG)" --init defaults/HerwigCleanup.in \
 		-r "$(THEPEGREPO)" -o "$(THEPEGREPO)" \
 		-l$(DESTDIR)$(pkglibdir) ; \
 	fi
 
 EXTRA_DIST = herwigopts.ggo
 
 nodist_Herwig_SOURCES = hgstamp.inc
 BUILT_SOURCES += hgstamp.inc
 CLEANFILES += hgstamp.inc
 
 HGVERSION := $(shell hg -R $(top_srcdir) parents --template '"Herwig {node|short} ({branch})"' 2> /dev/null || echo \"$(PACKAGE_STRING)\" || true )
 
 .PHONY: update_hgstamp
 hgstamp.inc: update_hgstamp
 	@[ -f $@ ] || touch $@
 	@echo '$(HGVERSION)' | cmp -s $@ - || echo '$(HGVERSION)' > $@
 
 GENGETOPT = gengetopt
 
 %opts.h %opts.c : %opts.ggo
 	$(GENGETOPT) < $<