diff --git a/src/LHC-MB.in b/src/LHC-MB.in
--- a/src/LHC-MB.in
+++ b/src/LHC-MB.in
@@ -1,103 +1,102 @@
 # -*- ThePEG-repository -*-
 
 ################################################################################
 # This file contains our best tune to UE data from ATLAS at 7 TeV. More recent
 # tunes and tunes for other centre-of-mass energies as well as more usage
 # instructions can be obtained from this Herwig wiki page:
 # http://projects.hepforge.org/herwig/trac/wiki/MB_UE_tunes
 # The model for soft interactions and diffractions is explained in
 # [S. Gieseke, P. Kirchgaesser, F. Loshaj, arXiv:1612.04701]
 ################################################################################
 
 read snippets/PPCollider.in
 
 ##################################################
 # Technical parameters for this run
 ##################################################
 cd /Herwig/Generators
 ##################################################
 # LHC physics parameters (override defaults here) 
 ##################################################
 set EventGenerator:EventHandler:LuminosityFunction:Energy 7000.0
 
 # Intrinsic pT tune extrapolated to LHC energy
 set /Herwig/Shower/ShowerHandler:IntrinsicPtGaussian 2.2*GeV
 
 # Minimum Bias
 read snippets/MB.in
 
 # Read in parameters of the soft model recommended for MB/UE simulations
 read snippets/SoftTune.in
 
 
 #Diffraction model
 read snippets/Diffraction.in
 
 #Turn on Baryonic reconnection
 read snippets/BaryonicReconnection.in
 
 
 # Normalization of the Min bias cross section for correct diffractive cross section
 set /Herwig/MatrixElements/MEMinBias:csNorm 0.01
 
 
 # Use LHC parametrization of the cross section
 set /Herwig/UnderlyingEvent/MPIHandler:DLmode 3
 
 
 #some preliminary parameters for the MPI model which need to be tuned
 #TODO
 set /Herwig/UnderlyingEvent/MPIHandler:pTmin0 3.02
 set /Herwig/UnderlyingEvent/MPIHandler:InvRadius 0.9
 set /Herwig/UnderlyingEvent/MPIHandler:Power 0.308
 set /Herwig/Partons/RemnantDecayer:ladderMult 0.45
 set /Herwig/Partons/RemnantDecayer:ladderbFactor 1.0
 
 #ordered pTs
 set /Herwig/Partons/RemnantDecayer:PtDistribution 5
 #use random remnant connections
 set /Herwig/Partons/RemnantDecayer:RandomConnection Yes
 
 # set the correct PDFs
-cd /Herwig/Partons
-set HardLOPDF:PDFName CT14lo
-set ShowerLOPDF:PDFName CT14lo
-set MPIPDF:PDFName CT14lo
-set RemnantPDF:PDFName CT14lo
+set /Herwig/Partons/HardLOPDF:PDFName CT14lo
+set /Herwig/Partons/ShowerLOPDF:PDFName CT14lo
+set /Herwig/Partons/MPIPDF:PDFName CT14lo
+set /Herwig/Partons/RemnantPDF:PDFName CT14lo
 
 #set /Herwig/Shower/ShowerHandler:CascadeHandler NULL     # Switch off parton shower
 #set /Herwig/Hadronization/HadronizationHandler:HadronizationHandler  NULL
 # do Soft interactions
 
 #set /Herwig/Hadronization/ColourReconnector:ColourReconnection No
 #################################################
 # Analyses
 ##################################################
 
 #Comment these lines out in order to use rivet analyses
 #cd /Herwig/Analysis
 #create ThePEG::RivetAnalysis RivetAnalysis RivetAnalysis.so
 
 #cd /Herwig/Generators
 #insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/RivetAnalysis
 
 #Some example analyses
 #insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2012_I1084540
 #insert /Herwig/Analysis/RivetAnalysis:Analyses 0 ATLAS_2010_S8918562
 
 #set /Herwig/Analysis/Plot:EventNumber 54
 #cd /Herwig/Generators
 #insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/Plot
 
 #insert EventGenerator:AnalysisHandlers 0 /Herwig/Analysis/HepMCFile
 #set /Herwig/Analysis/HepMCFile:PrintEvent 1000000
 #set /Herwig/Analysis/HepMCFile:Format GenEvent
 #set /Herwig/Analysis/HepMCFile:Units GeV_mm
 #set /Herwig/Analysis/HepMCFile:Filename events.fifo
 
 ##################################################
 # Save run for later usage with 'Herwig run'
 ##################################################
 cd /Herwig/Generators
 saverun LHC-MB EventGenerator
 
diff --git a/src/snippets/MB.in b/src/snippets/MB.in
--- a/src/snippets/MB.in
+++ b/src/snippets/MB.in
@@ -1,55 +1,55 @@
 ##################################################
 # MEMinBias Matrix Element
 ##################################################
 
 # MPI model settings
 set /Herwig/UnderlyingEvent/MPIHandler:IdenticalToUE 0
 
 ## Report the correct cross section
 cd /Herwig/Generators
 create Herwig::MPIXSecReweighter MPIXSecReweighter
 insert EventGenerator:EventHandler:PostSubProcessHandlers 0 MPIXSecReweighter
 set EventGenerator:EventHandler:CascadeHandler NULL
 
 clear EventGenerator:EventHandler:SubProcessHandlers[0]
 
 ##################################################
 # Create separate SubProcessHandler for MinBias
 ##################################################
 cd /Herwig/MatrixElements/
 cp SubProcess QCDMinBias
 
 set QCDMinBias:CascadeHandler /Herwig/Shower/ShowerHandler
 set QCDMinBias:CascadeHandler:MPIHandler /Herwig/UnderlyingEvent/MPIHandler
 set QCDMinBias:DecayHandler /Herwig/Decays/DecayHandler
 
 # Due to numerics the pomeron could be seen as timelike.
 set /Herwig/Shower/ShowerHandler:SplitHardProcess No
 set /Herwig/DipoleShower/DipoleShowerHandler:SplitHardProcess No
 
 insert QCDMinBias:MatrixElements[0] MEMinBias
 
 cd /Herwig/Generators
 # MinBias parameters used for the new kinematics of soft MPI
 set /Herwig/Cuts/MinBiasCuts:X1Min 0.011
 set /Herwig/Cuts/MinBiasCuts:X2Min 0.011
 
 
 #PDFs for MPI,Underlying Event, Min Bias
 # set the correct PDFs
-cd /Herwig/Partons
-set HardLOPDF:PDFName CT14lo
-set ShowerLOPDF:PDFName CT14lo
-set MPIPDF:PDFName CT14lo
-set RemnantPDF:PDFName CT14lo
+
+set /Herwig/Partons/HardLOPDF:PDFName CT14lo
+set /Herwig/Partons/ShowerLOPDF:PDFName CT14lo
+set /Herwig/Partons/MPIPDF:PDFName CT14lo
+set /Herwig/Partons/RemnantPDF:PDFName CT14lo
 
 
 # Needed to get the correct fraction of diffractive events
 set /Herwig/MatrixElements/MEMinBias:csNorm 0.01
 
 set /Herwig/MatrixElements/MEMinBias:Scale 2.0
 
 set EventGenerator:EventHandler:Cuts /Herwig/Cuts/MinBiasCuts
 
 cd /Herwig/MatrixElements/
 insert /Herwig/Generators/EventGenerator:EventHandler:SubProcessHandlers[0] QCDMinBias