diff --git a/MAPS/HMS/CRATE/db_crate11map.dat b/MAPS/HMS/CRATE/db_crate1map.dat
similarity index 91%
rename from MAPS/HMS/CRATE/db_crate11map.dat
rename to MAPS/HMS/CRATE/db_crate1map.dat
index 24391a43ff1ad4aa6a16489b6567acfb77709171..e7f21b55c893b663ca6d4b392643739b799d355d 100644
--- a/MAPS/HMS/CRATE/db_crate11map.dat
+++ b/MAPS/HMS/CRATE/db_crate1map.dat
@@ -1,4 +1,4 @@
-==== Crate 11 type vme Bank Decoding
+==== Crate 1 type vme Bank Decoding
 # slot  model   bank
   2      1190    1190
   3      250     250
diff --git a/MAPS/HMS/DETEC/haero.map b/MAPS/HMS/DETEC/haero.map
index 77b76a2046701b531ba734b5adc9c9e5330f5d5b..9c877a40a6126b11da9234c3dbd5e9cce217b33b 100644
--- a/MAPS/HMS/DETEC/haero.map
+++ b/MAPS/HMS/DETEC/haero.map
@@ -1,7 +1,7 @@
 !HMS:
 ! HAERO_ID= 12             (TDC),ADC
 
-ROC=11
+ROC=1
 detector=12
 
 !F250 modules
diff --git a/MAPS/HMS/DETEC/hcal.map b/MAPS/HMS/DETEC/hcal.map
index c4c2598af65c860247b729d487fc85148932a059..c79bed6a035d87096308f520044bdea9c1c2f245 100644
--- a/MAPS/HMS/DETEC/hcal.map
+++ b/MAPS/HMS/DETEC/hcal.map
@@ -1,7 +1,7 @@
 !HMS:
 ! HCAL_ID= 15              ADC
 
-ROC=11
+ROC=1
 detector=15
 
 !F250 modules
diff --git a/MAPS/HMS/DETEC/hcal_htrig.map b/MAPS/HMS/DETEC/hcal_htrig.map
index 5efc3fa6de2cf496a1e718c91b6862ba85c6e0c0..3c34c7d201d67f67c9532c06b456b1f9d82369db 100644
--- a/MAPS/HMS/DETEC/hcal_htrig.map
+++ b/MAPS/HMS/DETEC/hcal_htrig.map
@@ -4,7 +4,7 @@
 
 DETECTOR=10
 
-ROC=11
+ROC=1
 
 SLOT=17
    8,   1,   1,   0  ! hASUM
@@ -54,7 +54,7 @@ SLOT=17
 
 DETECTOR=15
 
-ROC=11
+ROC=1
 
 SLOT=3
    0,   1,   1,   0  ! hA01+
diff --git a/MAPS/HMS/DETEC/hcer.map b/MAPS/HMS/DETEC/hcer.map
index 4086cb574422da00949f59c01ba76e7c78fc92f7..805bd36530b4163dceca8978de314a3412ad9143 100644
--- a/MAPS/HMS/DETEC/hcer.map
+++ b/MAPS/HMS/DETEC/hcer.map
@@ -1,7 +1,7 @@
 !HMS:
 ! HCER_ID= 14             (TDC),ADC
 
-ROC=11
+ROC=1
 detector=14
 
 !F250 modules
diff --git a/MAPS/HMS/DETEC/hcer_htrig.map b/MAPS/HMS/DETEC/hcer_htrig.map
index c37bbc28980e73c15c76670b013c7132070a5d93..f46b6ef66ff57c8484f9b34554f1fc40922e734a 100644
--- a/MAPS/HMS/DETEC/hcer_htrig.map
+++ b/MAPS/HMS/DETEC/hcer_htrig.map
@@ -4,7 +4,7 @@
 
 DETECTOR=10
 
-ROC=11
+ROC=1
 
 SLOT=17
    8,   1,   1,   0  ! hASUM
@@ -54,7 +54,7 @@ SLOT=17
 
 DETECTOR=14
 
-ROC=11
+ROC=1
 
 SLOT=7
   14,   1,   1,   0  ! hCER01
diff --git a/MAPS/HMS/DETEC/hdc_hhodo_htrig.map b/MAPS/HMS/DETEC/hdc_hhodo_htrig.map
index 679672b4453e913b5c752aaea7a165a311b548dc..a9a7753709ad17a126e87b3fd2356a932025d3b0 100644
--- a/MAPS/HMS/DETEC/hdc_hhodo_htrig.map
+++ b/MAPS/HMS/DETEC/hdc_hhodo_htrig.map
@@ -5,7 +5,7 @@
 
 DETECTOR=10
 
-ROC=11
+ROC=1
 
 SLOT=17
    8,   1,   1,   0  ! hASUM
@@ -1213,7 +1213,7 @@ REFINDEX=0
 
 DETECTOR=13
 
-ROC=11
+ROC=1
 
 SLOT=8
    0,   1,   1,   0  ! h1x01A+
diff --git a/MAPS/HMS/DETEC/hdc_htrig.map b/MAPS/HMS/DETEC/hdc_htrig.map
index bb39d266fb3091148de0455847060f91ee40dfb7..b3e0097eda365accb4b940cbc151d64fad924c1c 100644
--- a/MAPS/HMS/DETEC/hdc_htrig.map
+++ b/MAPS/HMS/DETEC/hdc_htrig.map
@@ -4,7 +4,7 @@
 
 DETECTOR=10
 
-ROC=11
+ROC=1
 
 SLOT=17
    8,   1,   1,   0  ! hASUM
diff --git a/MAPS/HMS/DETEC/hhodo.map b/MAPS/HMS/DETEC/hhodo.map
index 32e3da271a64ba265fdcf8ac7a631c21b55af12d..698489c2c8da58580038b37d27d9ef1ebfcdc642 100644
--- a/MAPS/HMS/DETEC/hhodo.map
+++ b/MAPS/HMS/DETEC/hhodo.map
@@ -1,7 +1,7 @@
 !HMS:
 ! HSCIN_ID= 13   ADC+,ADC-,TDC+,TDC-
 
-ROC=11
+ROC=1
 detector=13
 
 ! F250 modules
diff --git a/MAPS/HMS/DETEC/hhodo_htrig.map b/MAPS/HMS/DETEC/hhodo_htrig.map
index eb7b107c6663eb1e9d33de57eba615da31dcf346..9d28bae5b459fe75c5a60dadd806137d668eb555 100644
--- a/MAPS/HMS/DETEC/hhodo_htrig.map
+++ b/MAPS/HMS/DETEC/hhodo_htrig.map
@@ -4,7 +4,7 @@
 
 DETECTOR=10
 
-ROC=11
+ROC=1
 
 SLOT=17
    8,   1,   1,   0  ! hASUM
@@ -54,7 +54,7 @@ SLOT=17
 
 DETECTOR=13
 
-ROC=11
+ROC=1
 
 SLOT=8
    0,   1,   1,   0  ! h1x01A+
diff --git a/MAPS/HMS/DETEC/hms_stack.map b/MAPS/HMS/DETEC/hms_stack.map
index 00e0b05c2346aaf52c22972a92350dbd6b194fb1..1547c7c6a4d979ef94fdd9f27df1f9e71cb51f48 100644
--- a/MAPS/HMS/DETEC/hms_stack.map
+++ b/MAPS/HMS/DETEC/hms_stack.map
@@ -7,7 +7,7 @@
 
 DETECTOR=10
 
-ROC=11
+ROC=1
 
 SLOT=17
    8,   1,   1,   0  ! hASUM
@@ -1215,7 +1215,7 @@ REFINDEX=0
 
 DETECTOR=13
 
-ROC=11
+ROC=1
 
 SLOT=8
    0,   1,   1,   0  ! h1x01A+
@@ -1446,7 +1446,7 @@ REFINDEX=0
 
 DETECTOR=14
 
-ROC=11
+ROC=1
 
 SLOT=7
   14,   1,   1,   0  ! hCER01
@@ -1455,7 +1455,7 @@ SLOT=7
 
 DETECTOR=15
 
-ROC=11
+ROC=1
 
 SLOT=3
    0,   1,   1,   0  ! hA01+
diff --git a/MAPS/HMS/DETEC/hraster_simple.map b/MAPS/HMS/DETEC/hraster_simple.map
index b5fb0ca2e453c5dcc890f9b3bd01a009df33360e..5f27fa719488421e2d661e81b9e8cb0a14a34aab 100644
--- a/MAPS/HMS/DETEC/hraster_simple.map
+++ b/MAPS/HMS/DETEC/hraster_simple.map
@@ -6,7 +6,7 @@
 
 detector=10
 
-ROC=11
+ROC=1
 
 !F250 module
 SLOT=18
diff --git a/MAPS/HMS/DETEC/htrig.map b/MAPS/HMS/DETEC/htrig.map
index dd624ea878235f2dcf713681d98c7e37d95f3d6d..679c33f761d052f496c60630ef2a7a3db1ac93fd 100644
--- a/MAPS/HMS/DETEC/htrig.map
+++ b/MAPS/HMS/DETEC/htrig.map
@@ -6,7 +6,7 @@
 
 detector=10
 
-ROC=11
+ROC=1
 
 !F250 module
 SLOT=17
diff --git a/MAPS/db_cratemap.dat b/MAPS/db_cratemap.dat
index 0b1ddd36b1c88fdfb92e2fd4736815ae126e8cf3..a8397b04ba440f94224fec0d9808a10dbcdac536 100644
--- a/MAPS/db_cratemap.dat
+++ b/MAPS/db_cratemap.dat
@@ -1,4 +1,4 @@
-==== Crate 11 type vme Bank Decoding
+==== Crate 1 type vme Bank Decoding
 # slot  model   bank
   2      1190    1190
   3      250     250
@@ -19,22 +19,6 @@
   20     1190    1190
 
 
-==== Crate 3 type vme Bank Decoding
-# slot  model   bank
-  4      1190    1190
-  5      1190    1190
-  7      1190    1190
-  8      1190    1190
-  10     1190    1190
-  13     1190    1190
-  14     1190    1190
-  16     1190    1190
-  17     1190    1190
-
-
-==== Crate 5 type vme Bank Decoding
-# slot  model   bank
-
 ==== Crate 2 type vme Bank Decoding
 # slot  model   bank
   3      250     250
@@ -51,6 +35,17 @@
   19     1190    1190
   20     1190    1190
 
+==== Crate 3 type vme Bank Decoding
+# slot  model   bank
+  4      1190    1190
+  5      1190    1190
+  7      1190    1190
+  8      1190    1190
+  10     1190    1190
+  13     1190    1190
+  14     1190    1190
+  16     1190    1190
+  17     1190    1190
 
 
 ==== Crate 4 type vme Bank Decoding
@@ -72,6 +67,8 @@
   19     250     250
   20     250     250
 
+==== Crate 5 type vme Bank Decoding
+# slot  model   bank
 
 ==== Crate 6 type vme Bank Decoding
 # slot  model   bank
diff --git a/MAPS/make_cratemap.sh b/MAPS/make_cratemap.sh
index c16ab876a0ab109f3a33ee2fdf79fb7620f8f151..438d879bd5db875b5db6a83c91676dcb85fb0a54 100755
--- a/MAPS/make_cratemap.sh
+++ b/MAPS/make_cratemap.sh
@@ -7,7 +7,7 @@ function proceed {
     echo ;read -p "Enter the crate(s), separated by spaces, you would like to form a single crate map for > " list
     arr=($list)
     for crate in "${arr[@]}"; do
-	if ((${crate} < 1)) || ((${crate} > 11)); then
+	if ((${crate} < 1)) || ((${crate} > 7)); then
 	    echo; echo "You must enter an integer value in the range [1, 7]"; echo
 	    exit
 	fi
diff --git a/MAPS/merge_list.txt b/MAPS/merge_list.txt
index b77eb3797e64b3e6d837a595c4de302e6db1fe7d..8fe2023f71bc611ab88da7624c4bb6ad1d9bb0f2 100644
--- a/MAPS/merge_list.txt
+++ b/MAPS/merge_list.txt
@@ -1,4 +1,8 @@
-HMS/DETEC/haero.map
-HMS/DETEC/hcal.map
+SHMS/DETEC/ptrig.map
+SHMS/DETEC/pdc.map
+SHMS/DETEC/phodo.map
+SHMS/DETEC/phgcer.map
+SHMS/DETEC/pngcer.map
+SHMS/DETEC/pcal.map
+SHMS/DETEC/paero.map
 
-#hhodo.map