diff --git a/SCRIPTS/COIN/PRODUCTION/replay_production_ep.C b/SCRIPTS/COIN/PRODUCTION/replay_production_ep.C
index 78954c9f0bb5a25d690a368e0679554342ca9fd6..ce951bcf7ec1880489e33053f9329fae5b695f26 100644
--- a/SCRIPTS/COIN/PRODUCTION/replay_production_ep.C
+++ b/SCRIPTS/COIN/PRODUCTION/replay_production_ep.C
@@ -85,14 +85,11 @@ void replay_production_ep (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
   gHaPhysics->Add(prp);
   THcExtTarCor* pext = new THcExtTarCor("P.extcor"," HMS extended target corrections","P","P.react");
   gHaPhysics->Add(pext);
-  // Add Physics Module to calculate primary (scattered) beam kinematics
-  THcPrimaryKine* pkin_primary = new THcPrimaryKine("P.kin.primary", "SHMS Single Arm Kinematics", "P", "P.rb");
-  gHaPhysics->Add(pkin_primary);
- THcHodoEff* peff = new THcHodoEff("phodeff"," SHMS hodo efficiency","P.hod");
+
+
+  // Hodoscope efficiency
+  THcHodoEff* peff = new THcHodoEff("phodeff"," SHMS hodo efficiency","P.hod");
   gHaPhysics->Add(peff);
-  // Add Physics Module to calculate secondary (scattered) beam kinematics
-  // THcSecondaryKine* pkin_secondary = new THcSecondaryKine("P.kin.secondary", "SHMS Single Arm Kinematics", "P", "H.kin.primary");
-  // gHaPhysics->Add(pkin_secondary);
   // Add event handler for scaler events
   //  THcScalerEvtHandler* pscaler = new THcScalerEvtHandler("P", "Hall C scaler event type 1");
   //pscaler->AddEvtType(1);
@@ -143,12 +140,7 @@ void replay_production_ep (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
   gHaPhysics->Add(hrp);
   THcExtTarCor* hext = new THcExtTarCor("H.extcor"," HMS extended target corrections","H","H.react");
   gHaPhysics->Add(hext);
-  // Add Physics Module to calculate primary (scattered) beam kinematics
-  // THcPrimaryKine* hkin_primary = new THcPrimaryKine("H.kin.primary", "HMS Single Arm Kinematics", "H", "H.rb");
-  // gHaPhysics->Add(hkin_primary);
-  // Add Physics Module to calculate secondary (scattered) beam kinematics
-  THcSecondaryKine* hkin_secondary = new THcSecondaryKine("H.kin.secondary", "HMS Single Arm Kinematics", "H", "P.kin.primary");
-  gHaPhysics->Add(hkin_secondary);
+  // Hodoscope efficiency
   THcHodoEff* heff = new THcHodoEff("hhodeff"," HMS hodo efficiency","H.hod");
   gHaPhysics->Add(heff);
   // Add event handler for scaler events
@@ -163,6 +155,30 @@ void replay_production_ep (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
   //hscaler->SetUseFirstEvent(kTRUE);
   //gHaEvtHandlers->Add(hscaler);
 
+  //=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=
+  // Kinematics Modules
+  //=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=
+
+  // ---------------------------------
+  // electrons in SHMS, protons in HMS
+  // ---------------------------------
+  // Add Physics Module to calculate primary (scattered) beam kinematics
+  // THcPrimaryKine* pkin_primary = new THcPrimaryKine("P.kin.primary", "SHMS Single Arm Kinematics", "P", "P.rb");
+  // gHaPhysics->Add(pkin_primary);
+  // Add Physics Module to calculate secondary (scattered) beam kinematics
+  // THcSecondaryKine* hkin_secondary = new THcSecondaryKine("H.kin.secondary", "HMS Single Arm Kinematics", "H", "P.kin.primary");
+  // gHaPhysics->Add(hkin_secondary);
+
+  // ---------------------------------
+  // electrons in HMS, protons in SHMS
+  // ---------------------------------
+  // Add Physics Module to calculate primary (scattered) beam kinematics
+  THcPrimaryKine* hkin_primary = new THcPrimaryKine("H.kin.primary", "HMS Single Arm Kinematics", "H", "H.rb");
+  gHaPhysics->Add(hkin_primary);
+  // Add Physics Module to calculate secondary (scattered) beam kinematics
+  THcSecondaryKine* pkin_secondary = new THcSecondaryKine("P.kin.secondary", "SHMS Single Arm Kinematics", "P", "H.kin.primary");
+  gHaPhysics->Add(pkin_secondary);
+
   //=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=
   // Global Objects & Event Handlers
   //=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=