diff --git a/DDG4/plugins/Geant4PhysicsLists.cpp b/DDG4/plugins/Geant4PhysicsLists.cpp
index 4d04f3263edeca6bc708c037bbdc3e9100ff1411..f502287559511aa7229f50f7352e018593fbf3f5 100644
--- a/DDG4/plugins/Geant4PhysicsLists.cpp
+++ b/DDG4/plugins/Geant4PhysicsLists.cpp
@@ -41,20 +41,26 @@ namespace {
 DECLARE_GEANT4_PHYSICS_LIST(EmptyPhysics)
 
 // Physics constructors from source/physics_lists
+#if G4VERSION_NUMBER < 1000
 #include "CHIPS.hh"
 DECLARE_GEANT4_PHYSICS_LIST(CHIPS)
+#endif
 
 #ifdef GEANT4_9_6
+
+#if G4VERSION_NUMBER < 1000
 #include "CHIPS_HP.hh"
   DECLARE_GEANT4_PHYSICS_LIST(CHIPS_HP)
-#include "FTFP_BERT.hh"
-  DECLARE_GEANT4_PHYSICS_LIST(FTFP_BERT)
-#include "FTFP_BERT_HP.hh"
-  DECLARE_GEANT4_PHYSICS_LIST(FTFP_BERT_HP)
 #include "QGSP_BERT_95.hh"
   DECLARE_GEANT4_PHYSICS_LIST(QGSP_BERT_95)
 #include "QGSP_BERT_95XS.hh"
   DECLARE_GEANT4_PHYSICS_LIST(QGSP_BERT_95XS)
+#endif
+
+#include "FTFP_BERT.hh"
+  DECLARE_GEANT4_PHYSICS_LIST(FTFP_BERT)
+#include "FTFP_BERT_HP.hh"
+  DECLARE_GEANT4_PHYSICS_LIST(FTFP_BERT_HP)
 #include "QGSP_INCLXX.hh"
   DECLARE_GEANT4_PHYSICS_LIST(QGSP_INCLXX)
 
@@ -62,53 +68,66 @@ DECLARE_GEANT4_PHYSICS_LIST(CHIPS)
 
 #include "FTF_BIC.hh"
   DECLARE_GEANT4_PHYSICS_LIST(FTF_BIC)
+
+#if G4VERSION_NUMBER < 1000
+
+// extra EM physics lists only via physicsListFactory
 #include "FTFP_BERT_EMV.hh"
   DECLARE_GEANT4_PHYSICS_LIST(FTFP_BERT_EMV)
 #include "FTFP_BERT_EMX.hh"
   DECLARE_GEANT4_PHYSICS_LIST(FTFP_BERT_EMX)
-#include "FTFP_BERT.hh"
-  DECLARE_GEANT4_PHYSICS_LIST(FTFP_BERT)
-#include "FTFP_BERT_TRV.hh"
-  DECLARE_GEANT4_PHYSICS_LIST(FTFP_BERT_TRV)
-#include "LBE.hh"
-//DECLARE_GEANT4_PHYSICS_LIST(LBE) takes no verbosity arg!
 #include "LHEP_EMV.hh"
   DECLARE_GEANT4_PHYSICS_LIST(LHEP_EMV)
+#include "QGSP_BERT_EMV.hh"
+  DECLARE_GEANT4_PHYSICS_LIST(QGSP_BERT_EMV)
+#include "QGSP_BERT_EMX.hh"
+  DECLARE_GEANT4_PHYSICS_LIST(QGSP_BERT_EMX)
+
+
+#include "QGSP_BIC_EMY.hh"
+  DECLARE_GEANT4_PHYSICS_LIST(QGSP_BIC_EMY)
+
+
 #include "LHEP.hh"
   DECLARE_GEANT4_PHYSICS_LIST(LHEP)
-#include "QBBC.hh"
-  DECLARE_GEANT4_PHYSICS_LIST(QBBC)
-#include "QGS_BIC.hh"
-  DECLARE_GEANT4_PHYSICS_LIST(QGS_BIC)
 #include "QGSC_BERT.hh"
   DECLARE_GEANT4_PHYSICS_LIST(QGSC_BERT)
 #include "QGSC_CHIPS.hh"
   DECLARE_GEANT4_PHYSICS_LIST(QGSC_CHIPS)
 #include "QGSP_BERT_CHIPS.hh"
   DECLARE_GEANT4_PHYSICS_LIST(QGSP_BERT_CHIPS)
-#include "QGSP_BERT_EMV.hh"
-  DECLARE_GEANT4_PHYSICS_LIST(QGSP_BERT_EMV)
-#include "QGSP_BERT_EMX.hh"
-  DECLARE_GEANT4_PHYSICS_LIST(QGSP_BERT_EMX)
-#include "QGSP_BERT.hh"
-  DECLARE_GEANT4_PHYSICS_LIST(QGSP_BERT)
 #include "QGSP_BERT_NOLEP.hh"
   DECLARE_GEANT4_PHYSICS_LIST(QGSP_BERT_NOLEP)
 #include "QGSP_BERT_TRV.hh"
   DECLARE_GEANT4_PHYSICS_LIST(QGSP_BERT_TRV)
-#include "QGSP_BIC_EMY.hh"
-  DECLARE_GEANT4_PHYSICS_LIST(QGSP_BIC_EMY)
+#include "QGSP.hh"
+  DECLARE_GEANT4_PHYSICS_LIST(QGSP)
+#include "QGSP_QEL.hh"
+  DECLARE_GEANT4_PHYSICS_LIST(QGSP_QEL)
+
+#include "HadronPhysicsCHIPS.hh"
+
+
+#endif
+
+#include "FTFP_BERT.hh"
+  DECLARE_GEANT4_PHYSICS_LIST(FTFP_BERT)
+#include "FTFP_BERT_TRV.hh"
+  DECLARE_GEANT4_PHYSICS_LIST(FTFP_BERT_TRV)
+#include "LBE.hh"
+//DECLARE_GEANT4_PHYSICS_LIST(LBE) takes no verbosity arg!
+#include "QBBC.hh"
+  DECLARE_GEANT4_PHYSICS_LIST(QBBC)
+#include "QGS_BIC.hh"
+  DECLARE_GEANT4_PHYSICS_LIST(QGS_BIC)
+#include "QGSP_BERT.hh"
+  DECLARE_GEANT4_PHYSICS_LIST(QGSP_BERT)
 #include "QGSP_BIC_HP.hh"
   DECLARE_GEANT4_PHYSICS_LIST(QGSP_BIC_HP)
 #include "QGSP_BIC.hh"
   DECLARE_GEANT4_PHYSICS_LIST(QGSP_BIC)
 #include "QGSP_FTFP_BERT.hh"
   DECLARE_GEANT4_PHYSICS_LIST(QGSP_FTFP_BERT)
-#include "QGSP.hh"
-  DECLARE_GEANT4_PHYSICS_LIST(QGSP)
-#include "QGSP_QEL.hh"
-  DECLARE_GEANT4_PHYSICS_LIST(QGSP_QEL)
-#include "HadronPhysicsCHIPS.hh"
 
 #if 0
 #include ".hh"