diff --git a/Inputs/DetectorConfiguration/hira_upgrade.detector b/Inputs/DetectorConfiguration/hira_upgrade.detector
index df05ab9fc281e93480b277aae94b4bfe72a9db9e..845a13982a9df8dc337c08af2960fc4f8ffeedde 100644
--- a/Inputs/DetectorConfiguration/hira_upgrade.detector
+++ b/Inputs/DetectorConfiguration/hira_upgrade.detector
@@ -15,122 +15,171 @@ HIRAArray
 
 %%%%%%% Telescope0 %%%%%%%
 HiraTelescope
- A= -177.657 64.6929 291.606
- B= -223.829 29.3441 262.173
- C= -211.837 -6.11417 273.759
- D= -165.941 29.2929 303.557
- ThinSi_DE= 1
+ A= -156.305 -173.834 263.552
+ B= -188.852 -203.91 215.761
+ C= -163.032 -232.465 208.619
+ D= -130.464 -202.409 256.407
+ ThinSi_DE= 0
  ThickSi_E= 1
  CsI= 1
 
 %%%%%%% Telescope1 %%%%%%%
 HiraTelescope
- A= -165.967 134.197 274.275
- B= -216.232 99.9158 250.91
- C= -208.327 65.8351 268.555
- D= -158.327 100.269 292.267
- ThinSi_DE= 1
+ A= -173.728 -100.878 289.399
+ B= -210.345 -134.992 247.647
+ C= -188.391 -167.381 246.239
+ D= -151.755 -133.29 287.992
+ ThinSi_DE= 0
  ThickSi_E= 1
  CsI= 1
 
 %%%%%%% Telescope2 %%%%%%%
 HiraTelescope
- A= -146.452 197.836 245.343
- B= -200.596 166.121 227.729
- C= -196.529 134.907 251.064
- D= -142.626 166.862 268.991
- ThinSi_DE= 1
+ A= -181.571 -22.7927 301.035
+ B= -222.662 -59.2104 265.919
+ C= -204.954 -93.7872 270.812
+ D= -163.848 -57.3939 305.933
+ ThinSi_DE= 0
  ThickSi_E= 1
  CsI= 1
 
-%%%%%%% Telescope4 %%%%%%%
+%%%%%%% Telescope3 %%%%%%%
 HiraTelescope
- A= -247.076 64.6929 235.688
- B= -284.058 29.3441 195.308
- C= -275.473 -6.11417 209.604
- D= -238.853 29.2929 250.264
- ThinSi_DE= 1
+ A= -179.436 56.4514 297.868
+ B= -225.175 19.5814 269.647
+ C= -211.881 -15.4248 281.087
+ D= -166.129 21.4205 309.318
+ ThinSi_DE= 0
  ThickSi_E= 1
  CsI= 1
 
-%%%%%%% Telescope5 %%%%%%%
+%%%%%%% Telescope4 %%%%%%%
 HiraTelescope
- A= -231.3 134.197 221.974
- B= -273.805 99.9158 186.395
- C= -270.736 65.8351 205.485
- D= -228.576 100.269 241.33
- ThinSi_DE= 1
+ A= -229.126 -173.834 203.451
+ B= -245.577 -203.91 148.019
+ C= -218.809 -232.465 149.078
+ D= -202.337 -202.409 204.513
+ ThinSi_DE= 0
  ThickSi_E= 1
  CsI= 1
 
-%%%%%%% Telescope6 %%%%%%%
+%%%%%%% Telescope5 %%%%%%%
 HiraTelescope
- A= -204.962 197.836 199.079
- B= -252.702 166.121 168.051
- C= -254.812 134.907 191.643
- D= -207.386 166.862 222.911
- ThinSi_DE= 1
+ A= -253.591 -100.878 222.766
+ B= -275.758 -134.992 171.848
+ C= -254.417 -167.381 177.191
+ D= -232.233 -133.29 228.116
+ ThinSi_DE= 0
  ThickSi_E= 1
  CsI= 1
 
-%%%%%%% Telescope7 %%%%%%%
+%%%%%%% Telescope6 %%%%%%%
 HiraTelescope
- A= -169.213 252.829 168.003
- B= -221.672 225.065 141.077
- C= -228.398 198.083 168.682
- D= -176.21 226.163 195.81
- ThinSi_DE= 1
+ A= -264.604 -22.7927 231.462
+ B= -293.053 -59.2104 185.502
+ C= -277.676 -93.7872 195.554
+ D= -249.214 -57.3939 241.523
+ ThinSi_DE= 0
  ThickSi_E= 1
  CsI= 1
 
 %%%%%%% Telescope7 %%%%%%%
 HiraTelescope
- A= -125.617 296.772 130.106
- B= -182.071 274.173 106.652
- C= -192.649 252.602 137.605
- D= -136.411 275.579 161.212
- ThinSi_DE= 1
+ A= -261.607 56.4514 229.095
+ B= -296.582 19.5814 188.289
+ C= -287.402 -15.4248 203.233
+ D= -252.418 21.4205 244.053
+ ThinSi_DE= 0
  ThickSi_E= 1
  CsI= 1
 
 %%%%%%% Telescope8 %%%%%%%
 HiraTelescope
- A= -305.189 64.6929 153.152
- B= -328.749 29.3441 103.724
- C= -324.718 -6.11417 119.904
- D= -301.587 29.2929 169.495
- ThinSi_DE= 1
+ A= -292.743 -139.329 137.835
+ B= -296.229 -171.569 81.2998
+ C= -273.828 -202.179 91.0104
+ D= -270.325 -169.961 147.556
+ ThinSi_DE= 0
  ThickSi_E= 1
  CsI= 1
 
 %%%%%%% Telescope9 %%%%%%%
 HiraTelescope
- A= -286.092 134.197 144.649
- B= -316.337 99.9158 98.1979
- C= -318.984 65.8351 117.351
- D= -289.147 100.269 163.956
- ThinSi_DE= 1
+ A= -314.059 -63.4009 146.481
+ B= -324.663 -98.8582 92.8326
+ C= -309.021 -132.523 105.284
+ D= -298.405 -97.0896 158.945
+ ThinSi_DE= 0
  ThickSi_E= 1
  CsI= 1
 
 %%%%%%% Telescope10 %%%%%%%
 HiraTelescope
- A= -254.211 197.836 130.455
- B= -290.793 166.121 86.8249
- C= -299.709 134.907 108.77
- D= -263.497 166.862 152.536
- ThinSi_DE= 1
+ A= -319.069 15.7508 148.513
+ B= -337.278 -21.1212 97.9493
+ C= -328.857 -56.1293 113.33
+ D= -310.641 -19.282 163.908
+ ThinSi_DE= 0
  ThickSi_E= 1
  CsI= 1
 
 %%%%%%% Telescope11 %%%%%%%
 HiraTelescope
- A= -210.939 252.829 111.189
- B= -253.233 225.065 70.1018
- C= -267.736 198.083 94.5344
- D= -225.76 226.163 135.735
- ThinSi_DE= 1
+ A= -307.519 94.1016 143.828
+ B= -333.433 57.6897 96.3898
+ C= -332.328 23.1183 114.738
+ D= -306.411 59.5059 162.192
+ ThinSi_DE= 0
  ThickSi_E= 1
  CsI= 1
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+Microball
+ RING1= 0
+ RING2= 0
+ RING3= 1
+ RING4= 1
+ RING5= 1
+ RING6= 1
+ RING7= 1
+ RING8= 1
+ RING9= 1
+ %DISABLE_CRYSTAL 19
+ DISABLE_CRYSTAL 20
+ DISABLE_CRYSTAL 21
+ DISABLE_CRYSTAL 22
+ %DISABLE_CRYSTAL 31
+ DISABLE_CRYSTAL 32
+ DISABLE_CRYSTAL 33
+ DISABLE_CRYSTAL 34
+ %DISABLE_CRYSTAL 43
+ DISABLE_CRYSTAL 44
+ DISABLE_CRYSTAL 45
+ DISABLE_CRYSTAL 46
+ DETECTOR_FLIP= 0
+ INCLUDE_CHAMBER= 0
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+NeutronWall
+ THETA= 50
+ PHI= 0
+ R= 4000
+ BARS= 25
+ VETOWALL= 1
+ VWDISTANCE= 429 
+ OVERLAP= 3
+ VWMATERIAL= BC400
+ NWMATERIAL= NE213
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+NeutronWall
+ THETA= 50
+ PHI= 0
+ R= 4573
+ BARS= 25
+ VETOWALL= 0
+ VWDISTANCE= 300
+ OVERLAP= 3
+ VWMATERIAL= BC400
+ NWMATERIAL= NE213
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%