diff --git a/src/main/java/org/clas/viewer/EventViewer.java b/src/main/java/org/clas/viewer/EventViewer.java
index b2a3237..1f46d65 100755
--- a/src/main/java/org/clas/viewer/EventViewer.java
+++ b/src/main/java/org/clas/viewer/EventViewer.java
@@ -56,7 +56,7 @@
 import org.jlab.utils.benchmark.BenchmarkTimer;
 import org.jlab.utils.options.OptionParser;
 
-        
+
 /**
  *
  * @author ziegler
@@ -225,8 +225,8 @@ public void initMenus() {
 
         String[] triggers = { "Electron OR", "Electron Sec 1","Electron Sec 2","Electron Sec 3",
                         "Electron Sec 4","Electron Sec 5","Electron Sec 6",
-		        "","","","","","","","","","","","","","","","","","","","","","","","",
-		        "Random Pulser"};    
+                        "","","","","","","","","","","","","","","","","","","","","","","","",
+                        "Random Pulser"};    
         
         JMenu trigBitsBeam = new JMenu("TriggerBits");
         trigBitsBeam.getAccessibleContext().setAccessibleDescription("Select Trigger Bits");        
@@ -251,7 +251,6 @@ public void itemStateChanged(ItemEvent e) {
             boolean bstate = ((this.triggerMask >> i) & 1) == 1;
             bb.setState(bstate);
             trigBitsBeam.add(bb); 
-        	        	
         }
         menuBar.add(trigBitsBeam); 
     }
@@ -544,13 +543,19 @@ private int getEventNumber(DataEvent event) {
         return bank != null ? bank.getInt("event", 0): this.eventCounter;
     }
 
+    private int getEventNumber(Event event) {
+        Bank bank = new Bank(schemaFactory.getSchema("RUN::config"));
+        event.read(bank);
+        return bank.getRows()>0 ? bank.getInt("event", 0): this.eventCounter;
+    }
+
     private void copyHitList(String k, String mon1, String mon2) {
-    	if (k == null ? mon1 != null : !k.equals(mon1)) return;
-    	this.monitors.get(mon1).ttdcs = this.monitors.get(mon2).ttdcs;
-    	this.monitors.get(mon1).ftdcs = this.monitors.get(mon2).ftdcs;
-    	this.monitors.get(mon1).fadcs = this.monitors.get(mon2).fadcs;
-   	this.monitors.get(mon1).fapmt = this.monitors.get(mon2).fapmt;
-    	this.monitors.get(mon1).ftpmt = this.monitors.get(mon2).ftpmt;
+        if (k == null ? mon1 != null : !k.equals(mon1)) return;
+        this.monitors.get(mon1).ttdcs = this.monitors.get(mon2).ttdcs;
+        this.monitors.get(mon1).ftdcs = this.monitors.get(mon2).ftdcs;
+        this.monitors.get(mon1).fadcs = this.monitors.get(mon2).fadcs;
+        this.monitors.get(mon1).fapmt = this.monitors.get(mon2).fapmt;
+        this.monitors.get(mon1).ftpmt = this.monitors.get(mon2).ftpmt;
     }
     
     
@@ -564,21 +569,12 @@ public void dataEventAction(DataEvent event) {
         if (beamMonitor != null && !beamMonitor.getBeamStatus()) {
             return;
         }
-        
+       
         // convert event to HIPO:
-    	DataEvent hipo = event;
+        DataEvent hipo = event;
         if (event instanceof EvioDataEvent) {
-            Event dump = this.clasDecoder.getDataEvent(event);
-            Bank header = this.clasDecoder.createHeaderBank(this.ccdbRunNumber, getEventNumber(event), (double)0, (double)0);
-            Bank trigger = this.clasDecoder.createTriggerBank();
-            Bank helicity = this.clasDecoder.createHelicityDecoderBank((EvioDataEvent)event);
-            Bank onlineHelicity = this.clasDecoder.createOnlineHelicityBank();
-            if(onlineHelicity!=null) dump.write(onlineHelicity);
-            if (header != null) dump.write(header);
-            if (trigger != null) dump.write(trigger);
-            if (helicity != null) dump.write(helicity);
-            this.clasDecoder.extractPulses(dump);  // Apply AHDC Decoder !!!
-	    hipo = new HipoDataEvent(dump, this.schemaFactory);
+            Event dump = this.clasDecoder.getDecodedEvent((EvioDataEvent)event, this.ccdbRunNumber, eventCounter, (double)0, (double)0);
+            hipo = new HipoDataEvent(dump, this.schemaFactory);
         }
         
         // if header bank is missing, do nothing
@@ -999,5 +995,5 @@ else if (parser.getOption("-batch").intValue() != 0) {
     public void processShape(DetectorShape2D dsd) {
         throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
     }
-       
+
 }