diff --git a/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder4.java b/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder4.java
index 17fee2548..ab2879a7f 100644
--- a/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder4.java
+++ b/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder4.java
@@ -248,7 +248,7 @@ public List<DetectorDataDgtz>  getEntriesSCALER(DetectorType type,
     }
 
     public void extractPulses(Event event) {
-        ahdcExtractor.update(6, null, event, schemaFactory, "AHDC::wf", "AHDC::adc");
+        ahdcExtractor.update(128, null, event, schemaFactory, "AHDC::wf", "AHDC::adc");
     }
 
     public Bank getDataBankWF(String name, DetectorType type) {
diff --git a/common-tools/clas-detector/src/main/java/org/jlab/detector/pulse/HipoExtractor.java b/common-tools/clas-detector/src/main/java/org/jlab/detector/pulse/HipoExtractor.java
index fba8012e4..180cb451c 100644
--- a/common-tools/clas-detector/src/main/java/org/jlab/detector/pulse/HipoExtractor.java
+++ b/common-tools/clas-detector/src/main/java/org/jlab/detector/pulse/HipoExtractor.java
@@ -96,7 +96,7 @@ private static void copyIndices(Bank src, Bank dest, int isrc, int idest) {
         dest.putByte("layer", idest, src.getByte("layer",isrc));
         dest.putShort("component", idest, src.getShort("component",isrc));
         dest.putByte("order", idest, src.getByte("order",isrc));
-        dest.putShort("id", idest, (short)isrc);
+        dest.putShort("windex", idest, (short)isrc);
     }
 
     private static void copyIndices(DataBank src, DataBank dest, int isrc, int idest) {
@@ -104,7 +104,7 @@ private static void copyIndices(DataBank src, DataBank dest, int isrc, int idest
         dest.setByte("layer", idest, src.getByte("layer",isrc));
         dest.setShort("component", idest, src.getShort("component",isrc));
         dest.setByte("order", idest, src.getByte("order",isrc));
-        dest.setShort("id", idest, (short)isrc);
+        dest.setShort("windex", idest, (short)isrc);
     }
 
     private static int[] getIndices(Bank bank, int row) {
diff --git a/etc/bankdefs/hipo4/data.json b/etc/bankdefs/hipo4/data.json
index 7a8ea6151..4b84b4feb 100644
--- a/etc/bankdefs/hipo4/data.json
+++ b/etc/bankdefs/hipo4/data.json
@@ -10,27 +10,150 @@
       { "name":"component" , "type":"S", "info":"strips"},
       { "name":"order"     , "type":"B", "info":"order: 0 - ADCL , 1 - ADCR"},
       { "name":"timestamp" , "type":"L", "info":"timestamp"},
-      { "name":"s1"        , "type":"S", "info":"sample #1"},
-      { "name":"s2"        , "type":"S", "info":"sample #2"},
-      { "name":"s3"        , "type":"S", "info":"sample #3"},
-      { "name":"s4"        , "type":"S", "info":"sample #4"},
-      { "name":"s5"        , "type":"S", "info":"sample #5"},
-      { "name":"s6"        , "type":"S", "info":"sample #6"}
+      { "name":"s1"        , "type":"S", "info":"first sample"},
+      { "name":"s2"        , "type":"S", "info":""},
+      { "name":"s3"        , "type":"S", "info":""},
+      { "name":"s4"        , "type":"S", "info":""},
+      { "name":"s5"        , "type":"S", "info":""},
+      { "name":"s6"        , "type":"S", "info":""},
+      { "name":"s7"        , "type":"S", "info":""},
+      { "name":"s8"        , "type":"S", "info":""},
+      { "name":"s9"        , "type":"S", "info":""},
+      { "name":"s10"        , "type":"S", "info":""},
+      { "name":"s11"        , "type":"S", "info":""},
+      { "name":"s12"        , "type":"S", "info":""},
+      { "name":"s13"        , "type":"S", "info":""},
+      { "name":"s14"        , "type":"S", "info":""},
+      { "name":"s15"        , "type":"S", "info":""},
+      { "name":"s16"        , "type":"S", "info":""},
+      { "name":"s17"        , "type":"S", "info":""},
+      { "name":"s18"        , "type":"S", "info":""},
+      { "name":"s19"        , "type":"S", "info":""},
+      { "name":"s20"        , "type":"S", "info":""},
+      { "name":"s21"        , "type":"S", "info":""},
+      { "name":"s22"        , "type":"S", "info":""},
+      { "name":"s23"        , "type":"S", "info":""},
+      { "name":"s24"        , "type":"S", "info":""},
+      { "name":"s25"        , "type":"S", "info":""},
+      { "name":"s26"        , "type":"S", "info":""},
+      { "name":"s27"        , "type":"S", "info":""},
+      { "name":"s28"        , "type":"S", "info":""},
+      { "name":"s29"        , "type":"S", "info":""},
+      { "name":"s30"        , "type":"S", "info":""},
+      { "name":"s31"        , "type":"S", "info":""},
+      { "name":"s32"        , "type":"S", "info":""},
+      { "name":"s33"        , "type":"S", "info":""},
+      { "name":"s34"        , "type":"S", "info":""},
+      { "name":"s35"        , "type":"S", "info":""},
+      { "name":"s36"        , "type":"S", "info":""},
+      { "name":"s37"        , "type":"S", "info":""},
+      { "name":"s38"        , "type":"S", "info":""},
+      { "name":"s39"        , "type":"S", "info":""},
+      { "name":"s40"        , "type":"S", "info":""},
+      { "name":"s41"        , "type":"S", "info":""},
+      { "name":"s42"        , "type":"S", "info":""},
+      { "name":"s43"        , "type":"S", "info":""},
+      { "name":"s44"        , "type":"S", "info":""},
+      { "name":"s45"        , "type":"S", "info":""},
+      { "name":"s46"        , "type":"S", "info":""},
+      { "name":"s47"        , "type":"S", "info":""},
+      { "name":"s48"        , "type":"S", "info":""},
+      { "name":"s49"        , "type":"S", "info":""},
+      { "name":"s50"        , "type":"S", "info":""},
+      { "name":"s51"        , "type":"S", "info":""},
+      { "name":"s52"        , "type":"S", "info":""},
+      { "name":"s53"        , "type":"S", "info":""},
+      { "name":"s54"        , "type":"S", "info":""},
+      { "name":"s55"        , "type":"S", "info":""},
+      { "name":"s56"        , "type":"S", "info":""},
+      { "name":"s57"        , "type":"S", "info":""},
+      { "name":"s58"        , "type":"S", "info":""},
+      { "name":"s59"        , "type":"S", "info":""},
+      { "name":"s60"        , "type":"S", "info":""},
+      { "name":"s61"        , "type":"S", "info":""},
+      { "name":"s62"        , "type":"S", "info":""},
+      { "name":"s63"        , "type":"S", "info":""},
+      { "name":"s64"        , "type":"S", "info":""},
+      { "name":"s65"        , "type":"S", "info":""},
+      { "name":"s66"        , "type":"S", "info":""},
+      { "name":"s67"        , "type":"S", "info":""},
+      { "name":"s68"        , "type":"S", "info":""},
+      { "name":"s69"        , "type":"S", "info":""},
+      { "name":"s70"        , "type":"S", "info":""},
+      { "name":"s71"        , "type":"S", "info":""},
+      { "name":"s72"        , "type":"S", "info":""},
+      { "name":"s73"        , "type":"S", "info":""},
+      { "name":"s74"        , "type":"S", "info":""},
+      { "name":"s75"        , "type":"S", "info":""},
+      { "name":"s76"        , "type":"S", "info":""},
+      { "name":"s77"        , "type":"S", "info":""},
+      { "name":"s78"        , "type":"S", "info":""},
+      { "name":"s79"        , "type":"S", "info":""},
+      { "name":"s80"        , "type":"S", "info":""},
+      { "name":"s81"        , "type":"S", "info":""},
+      { "name":"s82"        , "type":"S", "info":""},
+      { "name":"s83"        , "type":"S", "info":""},
+      { "name":"s84"        , "type":"S", "info":""},
+      { "name":"s85"        , "type":"S", "info":""},
+      { "name":"s86"        , "type":"S", "info":""},
+      { "name":"s87"        , "type":"S", "info":""},
+      { "name":"s88"        , "type":"S", "info":""},
+      { "name":"s89"        , "type":"S", "info":""},
+      { "name":"s90"        , "type":"S", "info":""},
+      { "name":"s91"        , "type":"S", "info":""},
+      { "name":"s92"        , "type":"S", "info":""},
+      { "name":"s93"        , "type":"S", "info":""},
+      { "name":"s94"        , "type":"S", "info":""},
+      { "name":"s95"        , "type":"S", "info":""},
+      { "name":"s96"        , "type":"S", "info":""},
+      { "name":"s97"        , "type":"S", "info":""},
+      { "name":"s98"        , "type":"S", "info":""},
+      { "name":"s99"        , "type":"S", "info":""},
+      { "name":"s100"        , "type":"S", "info":""},
+      { "name":"s101"        , "type":"S", "info":""},
+      { "name":"s102"        , "type":"S", "info":""},
+      { "name":"s103"        , "type":"S", "info":""},
+      { "name":"s104"        , "type":"S", "info":""},
+      { "name":"s105"        , "type":"S", "info":""},
+      { "name":"s106"        , "type":"S", "info":""},
+      { "name":"s107"        , "type":"S", "info":""},
+      { "name":"s108"        , "type":"S", "info":""},
+      { "name":"s109"        , "type":"S", "info":""},
+      { "name":"s110"        , "type":"S", "info":""},
+      { "name":"s111"        , "type":"S", "info":""},
+      { "name":"s112"        , "type":"S", "info":""},
+      { "name":"s113"        , "type":"S", "info":""},
+      { "name":"s114"        , "type":"S", "info":""},
+      { "name":"s115"        , "type":"S", "info":""},
+      { "name":"s116"        , "type":"S", "info":""},
+      { "name":"s117"        , "type":"S", "info":""},
+      { "name":"s118"        , "type":"S", "info":""},
+      { "name":"s119"        , "type":"S", "info":""},
+      { "name":"s120"        , "type":"S", "info":""},
+      { "name":"s121"        , "type":"S", "info":""},
+      { "name":"s122"        , "type":"S", "info":""},
+      { "name":"s123"        , "type":"S", "info":""},
+      { "name":"s124"        , "type":"S", "info":""},
+      { "name":"s125"        , "type":"S", "info":""},
+      { "name":"s126"        , "type":"S", "info":""},
+      { "name":"s127"        , "type":"S", "info":""},
+      { "name":"s128"        , "type":"S", "info":""}
     ]
   },
   {
     "name" : "AHDC::adc",
     "group": 22400,
     "item" : 11,
-	"info": "ADC bank for the ALERT Wire Chamber",
-	"entries":[
-	  { "name":"sector"    , "type":"B", "info":"sector 1"},
-	  { "name":"layer"     , "type":"B", "info":"layer 1-5"},
-	  { "name":"component" , "type":"S", "info":"wire number"},
-	  { "name":"order"     , "type":"B", "info":"Stereo angle 0 - in, 1 - out"},
-          { "name":"ADC"       , "type":"I", "info":"ADC maximum"}, 
-          { "name":"time"      , "type":"F", "info":"time from pulse fit"},
-          { "name":"ped"       , "type":"S", "info":"pedestal from pulse analysis"}
+    "info": "ADC bank for the ALERT Wire Chamber",
+    "entries":[
+      { "name":"sector"    , "type":"B", "info":"sector 1"},
+      { "name":"layer"     , "type":"B", "info":"layer 1-5"},
+      { "name":"component" , "type":"S", "info":"wire number"},
+      { "name":"order"     , "type":"B", "info":"Stereo angle 0 - in, 1 - out"},
+      { "name":"ADC"       , "type":"I", "info":"ADC maximum"},
+      { "name":"time"      , "type":"F", "info":"time from pulse fit"},
+      { "name":"ped"       , "type":"S", "info":"pedestal from pulse analysis"},
+      { "name":"windex"    , "type":"S", "info":"row index in waveform bank"}
     ]
   },
   {