diff --git a/macros/batch_1M.mac b/macros/batch_1M.mac
index 6e41788..01fae80 100644
--- a/macros/batch_1M.mac
+++ b/macros/batch_1M.mac
@@ -1,3 +1,8 @@
+# customize target parameters
+/muTomo/targetLocation 0 10 0 cm
+/muTomo/targetSize 10 10 20 cm
+/muTomo/targetMaterial G4_W
+
 /run/initialize
 /tracking/verbose 0
 /run/beamOn 1000000
diff --git a/macros/run1.mac b/macros/run1.mac
deleted file mode 100644
index 028208d..0000000
--- a/macros/run1.mac
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Initialize kernel
-/run/initialize
-#
-/control/verbose 2
-/run/verbose 2
-/event/verbose 0
-/tracking/verbose 1
-# 
-# gamma 6 MeV to the direction (0.,0.,1.)
-#
-/gun/particle gamma
-/gun/energy 6 MeV
-#
-/run/beamOn 5
-# 
-# proton 210 MeV to the direction (0.,0.,1.)
-#
-/gun/particle proton
-/gun/energy 210 MeV
-/tracking/verbose 2
-#
-/run/beamOn 1
diff --git a/macros/run2.mac b/macros/run2.mac
deleted file mode 100644
index 1d00add..0000000
--- a/macros/run2.mac
+++ /dev/null
@@ -1,22 +0,0 @@
-#/run/numberOfWorkers 4
-/run/initialize
-#
-/control/verbose 2
-/run/verbose 2
-#
-# gamma 6 MeV to the direction (0.,0.,1.)
-# 10000 events
-#
-/gun/particle gamma
-/gun/energy 6 MeV
-#
-/run/printProgress 100
-/run/beamOn 1000
-# 
-# proton 210 MeV to the direction (0.,0.,1.)
-# 1000 events
-#
-/gun/particle proton
-/gun/energy 210 MeV
-#
-/run/beamOn 1000
diff --git a/src/DetectorConstruction.cc b/src/DetectorConstruction.cc
index 03ea52f..fa7850b 100644
--- a/src/DetectorConstruction.cc
+++ b/src/DetectorConstruction.cc
@@ -23,6 +23,9 @@
 DetectorConstruction::DetectorConstruction()
     : G4VUserDetectorConstruction(), targetMaterialStr("G4_Pb"),
       fCheckOverlaps(false) {
+  targetX = 10 * cm;
+  targetY = 10 * cm;
+  targetZ = 5 * cm;
   fDetConMessenger = new DetectorConstructionMessenger(this);
   // DefineMaterials();
 }
@@ -175,9 +178,6 @@ void DetectorConstruction::ComputeGeometry() {
   concreteX = 30 * cm;
   concreteY = 30 * cm;
   concreteZ = 30 * cm;
-  targetX = 10 * cm;
-  targetY = 10 * cm;
-  targetZ = 5 * cm;
 
   worldSizeX = 1.2 * layerSizeX;
   worldSizeY = 1.2 * layerSizeY;