diff --git a/Inputs/DetectorConfiguration/e530.detector b/Inputs/DetectorConfiguration/e530.detector
index 9eae88d6be1d875d8e6d56a6f05a2713e79b02c5..0c5aab9e46c4ae57b697f213b0938ac83d915578 100644
--- a/Inputs/DetectorConfiguration/e530.detector
+++ b/Inputs/DetectorConfiguration/e530.detector
@@ -19,7 +19,7 @@
 GeneralTarget
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1
 Target
-	THICKNESS= 10.755
+	THICKNESS= 18.87
 	RADIUS=	1.25
 	MATERIAL= CD2
 	ANGLE= 0
diff --git a/NPSimulation/src/PhysicsList.cc b/NPSimulation/src/PhysicsList.cc
index d96cdcab839db56f351c34bf66c845a8f2455771..16f2cbb2e39056cd16d69f60f2eb17a5941b93be 100644
--- a/NPSimulation/src/PhysicsList.cc
+++ b/NPSimulation/src/PhysicsList.cc
@@ -40,7 +40,7 @@
 #include "G4ComptonScattering.hh"
 #include "G4GammaConversion.hh"
 #include "G4PhotoElectricEffect.hh"
-#include "G4MultipleScattering.hh"
+#include "G4eMultipleScattering.hh"
 #include "G4eIonisation.hh"
 #include "G4eBremsstrahlung.hh"
 #include "G4eplusAnnihilation.hh"
@@ -66,6 +66,7 @@
 
 
 #include "G4MuIonisation.hh"
+#include "G4MuMultipleScattering.hh"
 #include "G4MuBremsstrahlung.hh"
 #include "G4MuPairProduction.hh"
 
@@ -230,7 +231,7 @@ void PhysicsList::ConstructEM()
 
       } else if (particleName == "e-") {
          //electron
-         pmanager->AddProcess(new G4MultipleScattering  , -1,  1, 1)     ;
+         pmanager->AddProcess(new G4eMultipleScattering  , -1,  1, 1)     ;
     //standard geant4:
     pmanager->AddProcess(new G4eIonisation         , -1,  2, 2)     ;
     pmanager->AddProcess(new G4eBremsstrahlung     , -1, -1, 3)     ;
@@ -244,7 +245,7 @@ void PhysicsList::ConstructEM()
 
       } else if (particleName == "e+") {
          //positron
-   pmanager->AddProcess(new G4MultipleScattering  , -1,  1, 1 );
+   pmanager->AddProcess(new G4eMultipleScattering  , -1,  1, 1 );
    // standard Geant4 and Low energy
    pmanager->AddProcess(new G4eIonisation         , -1,  2, 2 );
    pmanager->AddProcess(new G4eBremsstrahlung     , -1, -1, 3 );
@@ -260,13 +261,13 @@ void PhysicsList::ConstructEM()
                  particleName == "mu-") {
   
     //muon
-         /*   pmanager->AddProcess(new G4MultipleScattering   , -1,  1, 1 )     ;
+         /*   pmanager->AddProcess(new G4muMultipleScattering   , -1,  1, 1 )     ;
             pmanager->AddProcess(new G4MuIonisation        , -1,  2, 2 )     ;
             pmanager->AddProcess(new G4MuBremsstrahlung    , -1, -1, 3 )     ;
             pmanager->AddProcess(new G4MuPairProduction    , -1, -1, 4 )     ;*/
   
       } else if (particleName == "GenericIon") {
-         pmanager->AddProcess(new G4MultipleScattering(), -1, 1, 1)        ;
+         pmanager->AddProcess(new G4hMultipleScattering(), -1, 1, 1)        ;
          G4ionIonisation* iI = new G4ionIonisation                   ;
          // mod by Nicolas [07/05/09]
           iI->ActivateNuclearStopping(true)                        ;
@@ -281,7 +282,7 @@ void PhysicsList::ConstructEM()
          G4hIonisation* hI = new G4hIonisation                      ;
          // mod by Nicolas [07/05/09]
 //        hI->ActivateNuclearStopping(true)                          ;
-         pmanager->AddProcess(new G4MultipleScattering     , -1, 1, 1)   ;
+         pmanager->AddProcess(new G4hMultipleScattering     , -1, 1, 1)   ;
          pmanager->AddProcess(hI                        , -1, 2, 2)   ;