diff --git a/trunk/src/com/jpexs/decompiler/flash/Configuration.java b/trunk/src/com/jpexs/decompiler/flash/Configuration.java
index 556ca641f..e18c4be2c 100644
--- a/trunk/src/com/jpexs/decompiler/flash/Configuration.java
+++ b/trunk/src/com/jpexs/decompiler/flash/Configuration.java
@@ -84,6 +84,7 @@ public class Configuration {
         put("gui.window.maximized.horizontal", false);
         put("gui.window.maximized.vertical", false);
         put("lastRenameType", 1);
+        put("removeNops", true);
     }};
 
     /**
diff --git a/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java b/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java
index cbb344a8a..fcfbbf2af 100644
--- a/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java
+++ b/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java
@@ -537,163 +537,163 @@ public class SWFInputStream extends InputStream {
         return ret;
     }
 
-    public List<Action> readActionList(List<DisassemblyListener> listeners, long address, long containerSWFOffset, String path) throws IOException {
+    public List<Action> readActionList(List<DisassemblyListener> listeners, long containerSWFOffset, String path) throws IOException {
         ReReadableInputStream rri = new ReReadableInputStream(this);
-        return readActionList(listeners, address, containerSWFOffset, rri, version, 0, -1, path);
+        return readActionList(listeners, containerSWFOffset, rri, version, 0, -1, path);
     }
 
-    public List<Action> readActionList(List<DisassemblyListener> listeners, long address, long containerSWFOffset, ReReadableInputStream rri, int maxlen, String path) throws IOException {
-        return readActionList(listeners, address, containerSWFOffset, rri, version, rri.getPos(), rri.getPos() + maxlen, path);
+    public List<Action> readActionList(List<DisassemblyListener> listeners, long containerSWFOffset, ReReadableInputStream rri, int maxlen, String path) throws IOException {
+        return readActionList(listeners, containerSWFOffset, rri, version, rri.getPos(), rri.getPos() + maxlen, path);
     }
 
-    @SuppressWarnings("unchecked")
-    private static void getConstantPool(List<DisassemblyListener> listeners, ConstantPool cpool, List<Object> localData, Stack<GraphTargetItem> stack, List<GraphTargetItem> output, ActionGraphSource code, int ip, List<ConstantPool> constantPools, List<Integer> visited, int version, int endIp, String path) {
-        boolean debugMode = false;
-        boolean deobfuscate = Configuration.getConfig("autoDeobfuscate", true);
-        while (((endIp == -1) || (endIp > ip)) && (ip > -1) && ip < code.size()) {
-            if (visited.contains(ip)) {
-                break;
-            }
-            for (int i = 0; i < listeners.size(); i++) {
-                listeners.get(i).progress("constantpool", ip + 1, code.size());
-            }
-            GraphSourceItem ins = code.get(ip);
-            if (ins.isIgnored()) {
-                if (ins.isExit()) {
-                    break;
-                }
-                ip++;
-                continue;
-            }
-
-            if (ins instanceof GraphSourceItemContainer) {
-                GraphSourceItemContainer cnt = (GraphSourceItemContainer) ins;
-                String cntName = cnt.getName();
-                if (ins instanceof Action) {
-                    List<List<GraphTargetItem>> output2s = new ArrayList<>();
-                    long endAddr = ((Action) ins).getAddress() + cnt.getHeaderSize();
-                    for (long size : cnt.getContainerSizes()) {
-                        if (size == 0) {
-                            output2s.add(new ArrayList<GraphTargetItem>());
-                            continue;
-                        }
-                        List<Object> localData2 = Helper.toList(new HashMap<Integer, String>(), new HashMap<String, GraphTargetItem>(), new HashMap<String, GraphTargetItem>());
-                        List<GraphTargetItem> output2 = new ArrayList<>();
-                        output2s.add(output2);
-                        getConstantPool(listeners, cpool, localData2, new Stack<GraphTargetItem>(), output2, code, code.adr2pos(endAddr), constantPools, visited, version, code.adr2pos(endAddr + size), path + (cntName == null ? "" : "/" + cntName));
-                        endAddr += size;
-                    }
-                    if (deobfuscate) {
-                        cnt.translateContainer(output2s, stack, output, (HashMap<Integer, String>) localData.get(0), (HashMap<String, GraphTargetItem>) localData.get(1), (HashMap<String, GraphTargetItem>) localData.get(2));
-                    }
-                    ip = code.adr2pos(endAddr);
-                    continue;
-                }
-            }
-            if (ins instanceof ActionPush) {
-                if (cpool != null) {
-                    ((ActionPush) ins).constantPool = cpool.constants;
-                    cpool.count++;
-                }
-            }
-            if (ins instanceof ActionDefineFunction) {
-                if (cpool != null) {
-                    //((ActionDefineFunction) ins).setConstantPool(cpool.constants,code.getActions());
-                    cpool.count++;
-                }
-            }
-            if (ins instanceof ActionDefineFunction2) {
-                if (cpool != null) {
-                    //((ActionDefineFunction2) ins).setConstantPool(cpool.constants,code.getActions());
-                    cpool.count++;
-                }
-            }
-            if (debugMode) {
-                String add = "";
-                if (ins instanceof ActionIf) {
-                    add += " change:" + ((ActionIf) ins).getJumpOffset();
-                }
-                if (ins instanceof ActionJump) {
-                    add += " change:" + (((ActionJump) ins).getJumpOffset());
-                }
-                System.err.println("getConstantPool ip " + ip + ", addr " + Helper.formatAddress(((Action) ins).getAddress()) + ": " + ((Action) ins).getASMSource(new ArrayList<GraphSourceItem>(), new ArrayList<Long>(), cpool == null ? null : cpool.constants, version, false) + add + " stack:" + Helper.stackToString(stack, Helper.toList(cpool)));
-            }
-            if (ins instanceof ActionConstantPool) {
-                constantPools.add(new ConstantPool(((ActionConstantPool) ins).constantPool));
-                if (cpool == null) {
-                    cpool = new ConstantPool();
-                }
-                cpool.setNew(((ActionConstantPool) ins).constantPool);
-            }
-
-            //for..in return
-            if (deobfuscate) {
-                if (((ins instanceof ActionEquals) || (ins instanceof ActionEquals2)) && (stack.size() == 1) && (stack.peek() instanceof DirectValueActionItem)) {
-                    stack.push(new DirectValueActionItem(null, 0, new Null(), new ArrayList<String>()));
-                }
-                try {
-                    ins.translate(localData, stack, output, Graph.SOP_USE_STATIC/*Graph.SOP_SKIP_STATIC*/, null);
-                } catch (Exception ex) {
-                    Logger.getLogger(SWFInputStream.class.getName()).log(Level.SEVERE, "Error during getting constantpool", ex);
-                }
-            }
-            if (ins.isExit()) {
-                break;
-            }
-
-            if (ins.isBranch() || ins.isJump()) {
-
-                if (deobfuscate && (ins instanceof ActionIf) && !stack.isEmpty() && (stack.peek().isCompileTime() && (!stack.peek().hasSideEffect()))) {
-                    boolean condition = EcmaScript.toBoolean(stack.peek().getResult());
-                    if (debugMode) {
-                        if (condition) {
-                            System.err.println("JUMP");
-                        } else {
-                            System.err.println("SKIP");
-                        }
-                    }
-                    stack.pop();
-                    getConstantPool(listeners, cpool, localData, stack, output, code, condition ? (code.adr2pos(((ActionIf) ins).getAddress() + ((ActionIf) ins).getBytes(code.version).length + ((ActionIf) ins).getJumpOffset())) : ip + 1, constantPools, visited, version, endIp, path);
-                } else {
-                    if (deobfuscate && ins instanceof ActionIf) {
-                        stack.pop();
-                    }
-                    visited.add(ip);
-                    List<Integer> branches = ins.getBranches(code);
-                    for (int b : branches) {
-                        @SuppressWarnings("unchecked")
-                        Stack<GraphTargetItem> brStack = (Stack<GraphTargetItem>) stack.clone();
-                        if (b >= 0) {
-                            getConstantPool(listeners, cpool, prepareLocalBranch(localData), brStack, output, code, b, constantPools, visited, version, endIp, path);
-                        } else {
-                            if (debugMode) {
-                                System.out.println("Negative branch:" + b);
-                            }
-                        }
-                    }
-                }
-                break;
-            }
-            ip++;
-        };
-        if (ip < 0) {
-            System.out.println("Visited Negative: " + ip);
-        }
-        for (DisassemblyListener listener : listeners) {
-            listener.progress("constantpool", ip + 1, code.size());
-        }
-    }
-
-    public static List<ConstantPool> getConstantPool(List<DisassemblyListener> listeners, ActionGraphSource code, int addr, int version, String path) {
-        List<ConstantPool> ret = new ArrayList<>();
-        List<Object> localData = Helper.toList(new HashMap<Integer, String>(), new HashMap<String, GraphTargetItem>(), new HashMap<String, GraphTargetItem>());
-        try {
-            getConstantPool(listeners, null, localData, new Stack<GraphTargetItem>(), new ArrayList<GraphTargetItem>(), code, code.adr2pos(addr), ret, new ArrayList<Integer>(), version, -1, path);
-        } catch (Exception ex) {
-            log.log(Level.SEVERE, "Error during getting constantpool", ex);
-        }
-        return ret;
-    }
+//    @SuppressWarnings("unchecked")
+//    private static void getConstantPool(List<DisassemblyListener> listeners, ConstantPool cpool, List<Object> localData, Stack<GraphTargetItem> stack, List<GraphTargetItem> output, ActionGraphSource code, int ip, List<ConstantPool> constantPools, List<Integer> visited, int version, int endIp, String path) {
+//        boolean debugMode = false;
+//        boolean deobfuscate = Configuration.getConfig("autoDeobfuscate", true);
+//        while (((endIp == -1) || (endIp > ip)) && (ip > -1) && ip < code.size()) {
+//            if (visited.contains(ip)) {
+//                break;
+//            }
+//            for (int i = 0; i < listeners.size(); i++) {
+//                listeners.get(i).progress("constantpool", ip + 1, code.size());
+//            }
+//            GraphSourceItem ins = code.get(ip);
+//            if (ins.isIgnored()) {
+//                if (ins.isExit()) {
+//                    break;
+//                }
+//                ip++;
+//                continue;
+//            }
+//
+//            if (ins instanceof GraphSourceItemContainer) {
+//                GraphSourceItemContainer cnt = (GraphSourceItemContainer) ins;
+//                String cntName = cnt.getName();
+//                if (ins instanceof Action) {
+//                    List<List<GraphTargetItem>> output2s = new ArrayList<>();
+//                    long endAddr = ((Action) ins).getAddress() + cnt.getHeaderSize();
+//                    for (long size : cnt.getContainerSizes()) {
+//                        if (size == 0) {
+//                            output2s.add(new ArrayList<GraphTargetItem>());
+//                            continue;
+//                        }
+//                        List<Object> localData2 = Helper.toList(new HashMap<Integer, String>(), new HashMap<String, GraphTargetItem>(), new HashMap<String, GraphTargetItem>());
+//                        List<GraphTargetItem> output2 = new ArrayList<>();
+//                        output2s.add(output2);
+//                        getConstantPool(listeners, cpool, localData2, new Stack<GraphTargetItem>(), output2, code, code.adr2pos(endAddr), constantPools, visited, version, code.adr2pos(endAddr + size), path + (cntName == null ? "" : "/" + cntName));
+//                        endAddr += size;
+//                    }
+//                    if (deobfuscate) {
+//                        cnt.translateContainer(output2s, stack, output, (HashMap<Integer, String>) localData.get(0), (HashMap<String, GraphTargetItem>) localData.get(1), (HashMap<String, GraphTargetItem>) localData.get(2));
+//                    }
+//                    ip = code.adr2pos(endAddr);
+//                    continue;
+//                }
+//            }
+//            if (ins instanceof ActionPush) {
+//                if (cpool != null) {
+//                    ((ActionPush) ins).constantPool = cpool.constants;
+//                    cpool.count++;
+//                }
+//            }
+//            if (ins instanceof ActionDefineFunction) {
+//                if (cpool != null) {
+//                    //((ActionDefineFunction) ins).setConstantPool(cpool.constants,code.getActions());
+//                    cpool.count++;
+//                }
+//            }
+//            if (ins instanceof ActionDefineFunction2) {
+//                if (cpool != null) {
+//                    //((ActionDefineFunction2) ins).setConstantPool(cpool.constants,code.getActions());
+//                    cpool.count++;
+//                }
+//            }
+//            if (debugMode) {
+//                String add = "";
+//                if (ins instanceof ActionIf) {
+//                    add += " change:" + ((ActionIf) ins).getJumpOffset();
+//                }
+//                if (ins instanceof ActionJump) {
+//                    add += " change:" + (((ActionJump) ins).getJumpOffset());
+//                }
+//                System.err.println("getConstantPool ip " + ip + ", addr " + Helper.formatAddress(((Action) ins).getAddress()) + ": " + ((Action) ins).getASMSource(new ArrayList<GraphSourceItem>(), new ArrayList<Long>(), cpool == null ? null : cpool.constants, version, false) + add + " stack:" + Helper.stackToString(stack, Helper.toList(cpool)));
+//            }
+//            if (ins instanceof ActionConstantPool) {
+//                constantPools.add(new ConstantPool(((ActionConstantPool) ins).constantPool));
+//                if (cpool == null) {
+//                    cpool = new ConstantPool();
+//                }
+//                cpool.setNew(((ActionConstantPool) ins).constantPool);
+//            }
+//
+//            //for..in return
+//            if (deobfuscate) {
+//                if (((ins instanceof ActionEquals) || (ins instanceof ActionEquals2)) && (stack.size() == 1) && (stack.peek() instanceof DirectValueActionItem)) {
+//                    stack.push(new DirectValueActionItem(null, 0, new Null(), new ArrayList<String>()));
+//                }
+//                try {
+//                    ins.translate(localData, stack, output, Graph.SOP_USE_STATIC/*Graph.SOP_SKIP_STATIC*/, null);
+//                } catch (Exception ex) {
+//                    Logger.getLogger(SWFInputStream.class.getName()).log(Level.SEVERE, "Error during getting constantpool", ex);
+//                }
+//            }
+//            if (ins.isExit()) {
+//                break;
+//            }
+//
+//            if (ins.isBranch() || ins.isJump()) {
+//
+//                if (deobfuscate && (ins instanceof ActionIf) && !stack.isEmpty() && (stack.peek().isCompileTime() && (!stack.peek().hasSideEffect()))) {
+//                    boolean condition = EcmaScript.toBoolean(stack.peek().getResult());
+//                    if (debugMode) {
+//                        if (condition) {
+//                            System.err.println("JUMP");
+//                        } else {
+//                            System.err.println("SKIP");
+//                        }
+//                    }
+//                    stack.pop();
+//                    getConstantPool(listeners, cpool, localData, stack, output, code, condition ? (code.adr2pos(((ActionIf) ins).getAddress() + ((ActionIf) ins).getBytes(code.version).length + ((ActionIf) ins).getJumpOffset())) : ip + 1, constantPools, visited, version, endIp, path);
+//                } else {
+//                    if (deobfuscate && ins instanceof ActionIf) {
+//                        stack.pop();
+//                    }
+//                    visited.add(ip);
+//                    List<Integer> branches = ins.getBranches(code);
+//                    for (int b : branches) {
+//                        @SuppressWarnings("unchecked")
+//                        Stack<GraphTargetItem> brStack = (Stack<GraphTargetItem>) stack.clone();
+//                        if (b >= 0) {
+//                            getConstantPool(listeners, cpool, prepareLocalBranch(localData), brStack, output, code, b, constantPools, visited, version, endIp, path);
+//                        } else {
+//                            if (debugMode) {
+//                                System.out.println("Negative branch:" + b);
+//                            }
+//                        }
+//                    }
+//                }
+//                break;
+//            }
+//            ip++;
+//        };
+//        if (ip < 0) {
+//            System.out.println("Visited Negative: " + ip);
+//        }
+//        for (DisassemblyListener listener : listeners) {
+//            listener.progress("constantpool", ip + 1, code.size());
+//        }
+//    }
+//
+//    public static List<ConstantPool> getConstantPool(List<DisassemblyListener> listeners, ActionGraphSource code, int addr, int version, String path) {
+//        List<ConstantPool> ret = new ArrayList<>();
+//        List<Object> localData = Helper.toList(new HashMap<Integer, String>(), new HashMap<String, GraphTargetItem>(), new HashMap<String, GraphTargetItem>());
+//        try {
+//            getConstantPool(listeners, null, localData, new Stack<GraphTargetItem>(), new ArrayList<GraphTargetItem>(), code, code.adr2pos(addr), ret, new ArrayList<Integer>(), version, -1, path);
+//        } catch (Exception ex) {
+//            log.log(Level.SEVERE, "Error during getting constantpool", ex);
+//        }
+//        return ret;
+//    }
 
     private static List<Object> prepareLocalBranch(List<Object> localData) {
         @SuppressWarnings("unchecked")
@@ -724,7 +724,7 @@ public class SWFInputStream extends InputStream {
      * @return List of actions
      * @throws IOException
      */
-    public static List<Action> readActionList(List<DisassemblyListener> listeners, long address, long containerSWFOffset, ReReadableInputStream rri, int version, int ip, int endip, String path) throws IOException {
+    public static List<Action> readActionList(List<DisassemblyListener> listeners, long containerSWFOffset, ReReadableInputStream rri, int version, int ip, int endip, String path) throws IOException {
         List<Action> retdups = new ArrayList<>();
         ConstantPool cpool = new ConstantPool();
 
@@ -742,7 +742,7 @@ public class SWFInputStream extends InputStream {
          method = 2;
          goesPrev = readActionListAtPos(true, localData, stack, cpool, sis, rri, ip, retdups, ip);
          }*/
-        goesPrev = readActionListAtPos(listeners, new ArrayList<GraphTargetItem>(), new HashMap<Long, List<GraphSourceItemContainer>>(), address, containerSWFOffset, localData, stack, cpool, sis, rri, ip, retdups, ip, endip, path, new HashMap<Integer, Integer>(), false, new HashMap<Integer, HashMap<String, GraphTargetItem>>());
+        goesPrev = readActionListAtPos(listeners, new ArrayList<GraphTargetItem>(), new HashMap<Long, List<GraphSourceItemContainer>>(), containerSWFOffset, localData, stack, cpool, sis, rri, ip, retdups, ip, endip, path, new HashMap<Integer, Integer>(), false, new HashMap<Integer, HashMap<String, GraphTargetItem>>());
 
         if (goesPrev) {
         } else {
@@ -771,13 +771,15 @@ public class SWFInputStream extends InputStream {
             }
         }
 
-        List<ConstantPool> pools;
-        ret = Action.removeNops(0, ret, version, 0, path);
-        pools = getConstantPool(listeners, new ActionGraphSource(ret, version, new HashMap<Integer, String>(), new HashMap<String, GraphTargetItem>(), new HashMap<String, GraphTargetItem>()), 0, version, path);
-
-        if (pools.size() == 1) {
-            Action.setConstantPool(ret, pools.get(0));
+        //List<ConstantPool> pools;
+        if (Configuration.getConfig("removeNops", true)) {
+            ret = Action.removeNops(0, ret, version, 0, path);
         }
+        //pools = getConstantPool(listeners, new ActionGraphSource(ret, version, new HashMap<Integer, String>(), new HashMap<String, GraphTargetItem>(), new HashMap<String, GraphTargetItem>()), 0, version, path);
+
+        /*if (pools.size() == 1) {
+            Action.setConstantPool(ret, pools.get(0));
+        }*/
         if (goesPrev && (!DEOBFUSCATION_ALL_CODE_IN_PREVIOUS_TAG)) {
             ActionJump aj = new ActionJump(ip);
             int skip = aj.getBytes(version).length;
@@ -801,7 +803,7 @@ public class SWFInputStream extends InputStream {
     }
 
     @SuppressWarnings("unchecked")
-    private static boolean readActionListAtPos(List<DisassemblyListener> listeners, List<GraphTargetItem> output, HashMap<Long, List<GraphSourceItemContainer>> containers, long address, long containerSWFOffset, List<Object> localData, Stack<GraphTargetItem> stack, ConstantPool cpool, SWFInputStream sis, ReReadableInputStream rri, int ip, List<Action> ret, int startIp, int endip, String path, Map<Integer, Integer> visited, boolean indeterminate, Map<Integer, HashMap<String, GraphTargetItem>> decisionStates) throws IOException {
+    private static boolean readActionListAtPos(List<DisassemblyListener> listeners, List<GraphTargetItem> output, HashMap<Long, List<GraphSourceItemContainer>> containers, long containerSWFOffset, List<Object> localData, Stack<GraphTargetItem> stack, ConstantPool cpool, SWFInputStream sis, ReReadableInputStream rri, int ip, List<Action> ret, int startIp, int endip, String path, Map<Integer, Integer> visited, boolean indeterminate, Map<Integer, HashMap<String, GraphTargetItem>> decisionStates) throws IOException {
         boolean debugMode = false;
         boolean decideBranch = false;
 
@@ -813,7 +815,7 @@ public class SWFInputStream extends InputStream {
         Scanner sc = new Scanner(System.in, "utf-8");
         int prevIp = ip;
         loopip:
-        while (((endip == -1) || (endip > ip)) && (a = sis.readAction(rri)) != null) {
+        while (((endip == -1) || (endip > ip)) && (a = sis.readAction(rri, cpool)) != null) {
             if (!visited.containsKey(ip)) {
                 visited.put(ip, 0);
             }
@@ -853,7 +855,7 @@ public class SWFInputStream extends InputStream {
 
             /*if(a instanceof ActionConstantPool){
              throw new IllegalArgumentException("CP found");
-             }     */
+             }     */   
             if (a instanceof ActionPush) {
                 if (cpool != null) {
                     ((ActionPush) a).constantPool = cpool.constants;
@@ -1041,7 +1043,7 @@ public class SWFInputStream extends InputStream {
                         } else {
                             localData2 = localData;
                         }
-                        readActionListAtPos(listeners, output2, containers, address, containerSWFOffset, localData2, new Stack<GraphTargetItem>(), cpool, sis, rri, (int) endAddr, ret, startIp, (int) (endAddr + size), path + (cntName == null ? "" : "/" + cntName), visited, indeterminate, decisionStates);
+                        readActionListAtPos(listeners, output2, containers, containerSWFOffset, localData2, new Stack<GraphTargetItem>(), cpool, sis, rri, (int) endAddr, ret, startIp, (int) (endAddr + size), path + (cntName == null ? "" : "/" + cntName), visited, indeterminate, decisionStates);
                         output2s.add(output2);
                         endAddr += size;
                     }
@@ -1118,7 +1120,7 @@ public class SWFInputStream extends InputStream {
                 int oldPos = rri.getPos();
                 @SuppressWarnings("unchecked")
                 Stack<GraphTargetItem> substack = (Stack<GraphTargetItem>) stack.clone();
-                if (readActionListAtPos(listeners, output, containers, address, containerSWFOffset, prepareLocalBranch(localData), substack, cpool, sis, rri, rri.getPos() + aif.getJumpOffset(), ret, startIp, endip, path, visited, indeterminate, decisionStates)) {
+                if (readActionListAtPos(listeners, output, containers, containerSWFOffset, prepareLocalBranch(localData), substack, cpool, sis, rri, rri.getPos() + aif.getJumpOffset(), ret, startIp, endip, path, visited, indeterminate, decisionStates)) {
                     retv = true;
                 }
                 rri.setPos(oldPos);
@@ -1659,8 +1661,8 @@ public class SWFInputStream extends InputStream {
         return ret;
     }
 
-    public Action readAction() throws IOException {
-        return readAction(new ReReadableInputStream(this));
+    public Action readAction(ConstantPool cpool) throws IOException {
+        return readAction(new ReReadableInputStream(this), cpool);
     }
 
     /**
@@ -1670,7 +1672,7 @@ public class SWFInputStream extends InputStream {
      * @return Action or null when ActionEndFlag or end of the stream
      * @throws IOException
      */
-    public Action readAction(ReReadableInputStream rri) throws IOException {
+    public Action readAction(ReReadableInputStream rri, ConstantPool cpool) throws IOException {
         {
             int actionCode = -1;
 
@@ -1708,7 +1710,7 @@ public class SWFInputStream extends InputStream {
                 case 0x09:
                     return new ActionStopSounds();
                 case 0x8A:
-                    return new ActionWaitForFrame(this);
+                    return new ActionWaitForFrame(this, cpool);
                 case 0x8B:
                     return new ActionSetTarget(actionLength, this, version);
                 case 0x8C:
@@ -1789,7 +1791,7 @@ public class SWFInputStream extends InputStream {
                 case 0x28:
                     return new ActionEndDrag();
                 case 0x8D:
-                    return new ActionWaitForFrame2(this);
+                    return new ActionWaitForFrame2(this, cpool);
                 case 0x26:
                     return new ActionTrace();
                 case 0x34:
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/Action.java b/trunk/src/com/jpexs/decompiler/flash/action/Action.java
index 264b0df3c..330eb41b2 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/Action.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/Action.java
@@ -418,10 +418,10 @@ public class Action implements GraphSourceItem {
             //setActionsAddresses(list, 0, version);
             importantOffsets = getActionsAllRefs(list, version);
         }
-        List<ConstantPool> cps = SWFInputStream.getConstantPool(new ArrayList<DisassemblyListener>(), new ActionGraphSource(list, version, new HashMap<Integer, String>(), new HashMap<String, GraphTargetItem>(), new HashMap<String, GraphTargetItem>()), 0, version, path);
+        /*List<ConstantPool> cps = SWFInputStream.getConstantPool(new ArrayList<DisassemblyListener>(), new ActionGraphSource(list, version, new HashMap<Integer, String>(), new HashMap<String, GraphTargetItem>(), new HashMap<String, GraphTargetItem>()), 0, version, path);
         if (!cps.isEmpty()) {
             setConstantPool(list, cps.get(cps.size() - 1));
-        }
+        }*/
         HashMap<Long, List<GraphSourceItemContainer>> containers = new HashMap<>();
         HashMap<GraphSourceItemContainer, Integer> containersPos = new HashMap<>();
         offset = address;
@@ -1199,7 +1199,7 @@ public class Action implements GraphSourceItem {
         String s = null;
         try {
             s = Action.actionsToString(new ArrayList<DisassemblyListener>(), address, ret, null, version, false, false, swfPos, path);
-            ret = ASMParser.parse(address, swfPos, true, new StringReader(s), SWF.DEFAULT_VERSION);
+            ret = ASMParser.parse(address, swfPos, true, s, SWF.DEFAULT_VERSION);
         } catch (Exception ex) {
             Logger.getLogger(SWFInputStream.class.getName()).log(Level.SEVERE, "parsing error", ex);
         }
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/parser/pcode/ASMParser.java b/trunk/src/com/jpexs/decompiler/flash/action/parser/pcode/ASMParser.java
index c66e9c1cc..e620e964d 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/parser/pcode/ASMParser.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/parser/pcode/ASMParser.java
@@ -32,6 +32,7 @@ import com.jpexs.decompiler.graph.GraphSourceItemContainer;
 import com.jpexs.helpers.Helper;
 import java.io.IOException;
 import java.io.Reader;
+import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -44,10 +45,16 @@ public class ASMParser {
     public static List<Action> parse(long containerSWFOffset, boolean ignoreNops, List<Label> labels, long address, FlasmLexer lexer, List<String> constantPool, int version) throws IOException, ParseException {
         List<Action> list = new ArrayList<>();
         Stack<GraphSourceItemContainer> containers = new Stack<>();
-        HashMap<GraphSourceItemContainer, Integer> containerPos = new HashMap<>();
         Stack<ActionStore> stores = new Stack<>();
         Stack<Integer> storeLengths = new Stack<>();
         int actualLen = 0;
+
+        ActionConstantPool cpool = new ActionConstantPool(constantPool);
+        cpool.containerSWFOffset = containerSWFOffset;
+        cpool.setAddress(address, version, false);
+        address += cpool.getBytes(version).length;
+        list.add(cpool);
+        
         while (true) {
             ASMParsedSymbol symb = lexer.yylex();
             if (symb.type == ASMParsedSymbol.TYPE_LABEL) {
@@ -67,228 +74,17 @@ public class ASMParser {
                     throw new ParseException("Block end without start", lexer.yyline());
                 }
                 GraphSourceItemContainer a = containers.peek();
-                int pos = containerPos.get(a);
-                containerPos.put(a, pos);
-                if (!a.parseDivision(pos, address, lexer)) {
+                if (!a.parseDivision(address - ((Action) a).getAddress(), lexer)) {
                     containers.pop();
                 }
             } else if (symb.type == ASMParsedSymbol.TYPE_INSTRUCTION_NAME) {
                 String instructionName = ((String) symb.value).toLowerCase();
-                Action a = null;
-                if (instructionName.equals("GetURL".toLowerCase())) {
-                    a = new ActionGetURL(lexer);
-                } else if (instructionName.equals("GoToLabel".toLowerCase())) {
-                    a = (new ActionGoToLabel(lexer));
-                } else if (instructionName.equals("GotoFrame".toLowerCase())) {
-                    a = (new ActionGotoFrame(lexer));
-                } else if (instructionName.equals("NextFrame".toLowerCase())) {
-                    a = (new ActionNextFrame());
-                } else if (instructionName.equals("Play".toLowerCase())) {
-                    a = (new ActionPlay());
-                } else if (instructionName.equals("PrevFrame".toLowerCase())) {
-                    a = (new ActionPrevFrame());
-                } else if (instructionName.equals("SetTarget".toLowerCase())) {
-                    a = (new ActionSetTarget(lexer));
-                } else if (instructionName.equals("Stop".toLowerCase())) {
-                    a = (new ActionStop());
-                } else if (instructionName.equals("StopSounds".toLowerCase())) {
-                    a = (new ActionStopSounds());
-                } else if (instructionName.equals("ToggleQuality".toLowerCase())) {
-                    a = (new ActionToggleQuality());
-                } else if (instructionName.equals("WaitForFrame".toLowerCase())) {
-                    a = (new ActionWaitForFrame(lexer));
-                } else if (instructionName.equals("Add".toLowerCase())) {
-                    a = (new ActionAdd());
-                } else if (instructionName.equals("And".toLowerCase())) {
-                    a = (new ActionAnd());
-                } else if (instructionName.equals("AsciiToChar".toLowerCase())) {
-                    a = (new ActionAsciiToChar());
-                } else if (instructionName.equals("Call".toLowerCase())) {
-                    a = (new ActionCall());
-                } else if (instructionName.equals("CharToAscii".toLowerCase())) {
-                    a = (new ActionCharToAscii());
-                } else if (instructionName.equals("CloneSprite".toLowerCase())) {
-                    a = (new ActionCloneSprite());
-                } else if (instructionName.equals("Divide".toLowerCase())) {
-                    a = (new ActionDivide());
-                } else if (instructionName.equals("EndDrag".toLowerCase())) {
-                    a = (new ActionEndDrag());
-                } else if (instructionName.equals("Equals".toLowerCase())) {
-                    a = (new ActionEquals());
-                } else if (instructionName.equals("GetProperty".toLowerCase())) {
-                    a = (new ActionGetProperty());
-                } else if (instructionName.equals("GetTime".toLowerCase())) {
-                    a = (new ActionGetTime());
-                } else if (instructionName.equals("GetURL2".toLowerCase())) {
-                    a = (new ActionGetURL2(lexer));
-                } else if (instructionName.equals("GetVariable".toLowerCase())) {
-                    a = (new ActionGetVariable());
-                } else if (instructionName.equals("GotoFrame2".toLowerCase())) {
-                    a = (new ActionGotoFrame2(lexer));
-                } else if (instructionName.equals("If".toLowerCase())) {
-                    a = (new ActionIf(lexer));
-                } else if (instructionName.equals("Jump".toLowerCase())) {
-                    a = (new ActionJump(lexer));
-                } else if (instructionName.equals("Less".toLowerCase())) {
-                    a = (new ActionLess());
-                } else if (instructionName.equals("MBAsciiToChar".toLowerCase())) {
-                    a = (new ActionMBAsciiToChar());
-                } else if (instructionName.equals("MBCharToAscii".toLowerCase())) {
-                    a = (new ActionMBCharToAscii());
-                } else if (instructionName.equals("MBStringExtract".toLowerCase())) {
-                    a = (new ActionMBStringExtract());
-                } else if (instructionName.equals("MBStringLength".toLowerCase())) {
-                    a = (new ActionMBStringLength());
-                } else if (instructionName.equals("Multiply".toLowerCase())) {
-                    a = (new ActionMultiply());
-                } else if (instructionName.equals("Not".toLowerCase())) {
-                    a = (new ActionNot());
-                } else if (instructionName.equals("Or".toLowerCase())) {
-                    a = (new ActionOr());
-                } else if (instructionName.equals("Pop".toLowerCase())) {
-                    a = (new ActionPop());
-                } else if (instructionName.equals("Push".toLowerCase())) {
-                    a = (new ActionPush(lexer, constantPool));
-                } else if (instructionName.equals("RandomNumber".toLowerCase())) {
-                    a = (new ActionRandomNumber());
-                } else if (instructionName.equals("RemoveSprite".toLowerCase())) {
-                    a = (new ActionRemoveSprite());
-                } else if (instructionName.equals("SetProperty".toLowerCase())) {
-                    a = (new ActionSetProperty());
-                } else if (instructionName.equals("SetTarget2".toLowerCase())) {
-                    a = (new ActionSetTarget2());
-                } else if (instructionName.equals("SetVariable".toLowerCase())) {
-                    a = (new ActionSetVariable());
-                } else if (instructionName.equals("StartDrag".toLowerCase())) {
-                    a = (new ActionStartDrag());
-                } else if (instructionName.equals("StringAdd".toLowerCase())) {
-                    a = (new ActionStringAdd());
-                } else if (instructionName.equals("StringEquals".toLowerCase())) {
-                    a = (new ActionStringEquals());
-                } else if (instructionName.equals("StringExtract".toLowerCase())) {
-                    a = (new ActionStringExtract());
-                } else if (instructionName.equals("StringLength".toLowerCase())) {
-                    a = (new ActionStringLength());
-                } else if (instructionName.equals("StringLess".toLowerCase())) {
-                    a = (new ActionStringLess());
-                } else if (instructionName.equals("Subtract".toLowerCase())) {
-                    a = (new ActionSubtract());
-                } else if (instructionName.equals("ToInteger".toLowerCase())) {
-                    a = (new ActionToInteger());
-                } else if (instructionName.equals("Trace".toLowerCase())) {
-                    a = (new ActionTrace());
-                } else if (instructionName.equals("WaitForFrame2".toLowerCase())) {
-                    a = (new ActionWaitForFrame2(lexer));
-                } else if (instructionName.equals("Add2".toLowerCase())) {
-                    a = (new ActionAdd2());
-                } else if (instructionName.equals("BitAnd".toLowerCase())) {
-                    a = (new ActionBitAnd());
-                } else if (instructionName.equals("BitLShift".toLowerCase())) {
-                    a = (new ActionBitLShift());
-                } else if (instructionName.equals("BitOr".toLowerCase())) {
-                    a = (new ActionBitOr());
-                } else if (instructionName.equals("BitRShift".toLowerCase())) {
-                    a = (new ActionBitRShift());
-                } else if (instructionName.equals("BitURShift".toLowerCase())) {
-                    a = (new ActionBitURShift());
-                } else if (instructionName.equals("BitXor".toLowerCase())) {
-                    a = (new ActionBitXor());
-                } else if (instructionName.equals("CallFunction".toLowerCase())) {
-                    a = (new ActionCallFunction());
-                } else if (instructionName.equals("CallMethod".toLowerCase())) {
-                    a = (new ActionCallMethod());
-                } else if (instructionName.equals("ConstantPool".toLowerCase())) {
-                    ActionConstantPool acp = new ActionConstantPool(lexer);
-                    constantPool = acp.constantPool;
-                    a = (acp);
-                } else if (instructionName.equals("Decrement".toLowerCase())) {
-                    a = (new ActionDecrement());
-                } else if (instructionName.equals("DefineFunction".toLowerCase())) {
-                    a = (new ActionDefineFunction(containerSWFOffset + address, ignoreNops, labels, address, lexer, constantPool, version));
-                } else if (instructionName.equals("DefineLocal".toLowerCase())) {
-                    a = (new ActionDefineLocal());
-                } else if (instructionName.equals("DefineLocal2".toLowerCase())) {
-                    a = (new ActionDefineLocal2());
-                } else if (instructionName.equals("Delete".toLowerCase())) {
-                    a = (new ActionDelete());
-                } else if (instructionName.equals("Delete2".toLowerCase())) {
-                    a = (new ActionDelete2());
-                } else if (instructionName.equals("Enumerate".toLowerCase())) {
-                    a = (new ActionEnumerate());
-                } else if (instructionName.equals("Equals2".toLowerCase())) {
-                    a = (new ActionEquals2());
-                } else if (instructionName.equals("GetMember".toLowerCase())) {
-                    a = (new ActionGetMember());
-                } else if (instructionName.equals("Increment".toLowerCase())) {
-                    a = (new ActionIncrement());
-                } else if (instructionName.equals("InitArray".toLowerCase())) {
-                    a = (new ActionInitArray());
-                } else if (instructionName.equals("InitObject".toLowerCase())) {
-                    a = (new ActionInitObject());
-                } else if (instructionName.equals("Less2".toLowerCase())) {
-                    a = (new ActionLess2());
-                } else if (instructionName.equals("Modulo".toLowerCase())) {
-                    a = (new ActionModulo());
-                } else if (instructionName.equals("NewMethod".toLowerCase())) {
-                    a = (new ActionNewMethod());
-                } else if (instructionName.equals("NewObject".toLowerCase())) {
-                    a = (new ActionNewObject());
-                } else if (instructionName.equals("PushDuplicate".toLowerCase())) {
-                    a = (new ActionPushDuplicate());
-                } else if (instructionName.equals("Return".toLowerCase())) {
-                    a = (new ActionReturn());
-                } else if (instructionName.equals("SetMember".toLowerCase())) {
-                    a = (new ActionSetMember());
-                } else if (instructionName.equals("StackSwap".toLowerCase())) {
-                    a = (new ActionStackSwap());
-                } else if (instructionName.equals("StoreRegister".toLowerCase())) {
-                    a = (new ActionStoreRegister(lexer));
-                } else if (instructionName.equals("TargetPath".toLowerCase())) {
-                    a = (new ActionTargetPath());
-                } else if (instructionName.equals("ToNumber".toLowerCase())) {
-                    a = (new ActionToNumber());
-                } else if (instructionName.equals("ToString".toLowerCase())) {
-                    a = (new ActionToString());
-                } else if (instructionName.equals("TypeOf".toLowerCase())) {
-                    a = (new ActionTypeOf());
-                } else if (instructionName.equals("With".toLowerCase())) {
-                    a = (new ActionWith(containerSWFOffset + address, ignoreNops, labels, address, lexer, constantPool, version));
-                } else if (instructionName.equals("Enumerate2".toLowerCase())) {
-                    a = (new ActionEnumerate2());
-                } else if (instructionName.equals("Greater".toLowerCase())) {
-                    a = (new ActionGreater());
-                } else if (instructionName.equals("InstanceOf".toLowerCase())) {
-                    a = (new ActionInstanceOf());
-                } else if (instructionName.equals("StrictEquals".toLowerCase())) {
-                    a = (new ActionStrictEquals());
-                } else if (instructionName.equals("StringGreater".toLowerCase())) {
-                    a = (new ActionStringGreater());
-                } else if (instructionName.equals("CastOp".toLowerCase())) {
-                    a = (new ActionCastOp());
-                } else if (instructionName.equals("DefineFunction2".toLowerCase())) {
-                    a = (new ActionDefineFunction2(containerSWFOffset + address, ignoreNops, labels, address, lexer, constantPool, version));
-                } else if (instructionName.equals("Extends".toLowerCase())) {
-                    a = (new ActionExtends());
-                } else if (instructionName.equals("ImplementsOp".toLowerCase())) {
-                    a = (new ActionImplementsOp());
-                } else if (instructionName.equals("Throw".toLowerCase())) {
-                    a = (new ActionThrow());
-                } else if (instructionName.equals("Try".toLowerCase())) {
-                    a = (new ActionTry(containerSWFOffset + address, ignoreNops, labels, address, lexer, constantPool, version));
-                } else if (instructionName.equals("FSCommand2".toLowerCase())) {
-                    a = (new ActionFSCommand2());
-                } else if (instructionName.equals("StrictMode".toLowerCase())) {
-                    a = (new ActionStrictMode(lexer));
-                } else if (instructionName.equals("Nop".toLowerCase())) {
-                    if (!ignoreNops) {
-                        a = (new ActionNop());
-                    }
-                } else if (instructionName.equals("FFDec_DeobfuscatePop".toLowerCase())) {
-                    a = new ActionDeobfuscatePop();
-                }/* else if(instructionName.startsWith("ofs")) {
-                 continue;
-                 }*/ else {
-                    throw new ParseException("Unknown instruction name :" + instructionName, lexer.yyline());
+                Action a = parseAction(instructionName, lexer, constantPool, version);
+                if (ignoreNops && a instanceof ActionNop) {
+                    a = null;
+                }
+                if (a instanceof ActionConstantPool) {
+                    a = null;
                 }
                 if (a instanceof ActionNop) {
                     a.containerSWFOffset = containerSWFOffset;
@@ -301,7 +97,6 @@ public class ASMParser {
                 }
                 if (a instanceof GraphSourceItemContainer) {
                     containers.push((GraphSourceItemContainer) a);
-                    containerPos.put((GraphSourceItemContainer) a, 0);
                 }
                 if (a != null) {
                     list.add(a);
@@ -339,10 +134,263 @@ public class ASMParser {
         }
     }
 
-    public static List<Action> parse(long address, long containerSWFOffset, boolean ignoreNops, Reader is, int version) throws IOException, ParseException {
-        FlasmLexer lexer = new FlasmLexer(is);
+    private static Action parseAction(String instructionName, FlasmLexer lexer, List<String> constantPool, int version) throws IOException, ParseException {
+        Action a = null;
+        if (instructionName.equals("GetURL".toLowerCase())) {
+            a = new ActionGetURL(lexer);
+        } else if (instructionName.equals("GoToLabel".toLowerCase())) {
+            a = (new ActionGoToLabel(lexer));
+        } else if (instructionName.equals("GotoFrame".toLowerCase())) {
+            a = (new ActionGotoFrame(lexer));
+        } else if (instructionName.equals("NextFrame".toLowerCase())) {
+            a = (new ActionNextFrame());
+        } else if (instructionName.equals("Play".toLowerCase())) {
+            a = (new ActionPlay());
+        } else if (instructionName.equals("PrevFrame".toLowerCase())) {
+            a = (new ActionPrevFrame());
+        } else if (instructionName.equals("SetTarget".toLowerCase())) {
+            a = (new ActionSetTarget(lexer));
+        } else if (instructionName.equals("Stop".toLowerCase())) {
+            a = (new ActionStop());
+        } else if (instructionName.equals("StopSounds".toLowerCase())) {
+            a = (new ActionStopSounds());
+        } else if (instructionName.equals("ToggleQuality".toLowerCase())) {
+            a = (new ActionToggleQuality());
+        } else if (instructionName.equals("WaitForFrame".toLowerCase())) {
+            a = (new ActionWaitForFrame(lexer));
+        } else if (instructionName.equals("Add".toLowerCase())) {
+            a = (new ActionAdd());
+        } else if (instructionName.equals("And".toLowerCase())) {
+            a = (new ActionAnd());
+        } else if (instructionName.equals("AsciiToChar".toLowerCase())) {
+            a = (new ActionAsciiToChar());
+        } else if (instructionName.equals("Call".toLowerCase())) {
+            a = (new ActionCall());
+        } else if (instructionName.equals("CharToAscii".toLowerCase())) {
+            a = (new ActionCharToAscii());
+        } else if (instructionName.equals("CloneSprite".toLowerCase())) {
+            a = (new ActionCloneSprite());
+        } else if (instructionName.equals("Divide".toLowerCase())) {
+            a = (new ActionDivide());
+        } else if (instructionName.equals("EndDrag".toLowerCase())) {
+            a = (new ActionEndDrag());
+        } else if (instructionName.equals("Equals".toLowerCase())) {
+            a = (new ActionEquals());
+        } else if (instructionName.equals("GetProperty".toLowerCase())) {
+            a = (new ActionGetProperty());
+        } else if (instructionName.equals("GetTime".toLowerCase())) {
+            a = (new ActionGetTime());
+        } else if (instructionName.equals("GetURL2".toLowerCase())) {
+            a = (new ActionGetURL2(lexer));
+        } else if (instructionName.equals("GetVariable".toLowerCase())) {
+            a = (new ActionGetVariable());
+        } else if (instructionName.equals("GotoFrame2".toLowerCase())) {
+            a = (new ActionGotoFrame2(lexer));
+        } else if (instructionName.equals("If".toLowerCase())) {
+            a = (new ActionIf(lexer));
+        } else if (instructionName.equals("Jump".toLowerCase())) {
+            a = (new ActionJump(lexer));
+        } else if (instructionName.equals("Less".toLowerCase())) {
+            a = (new ActionLess());
+        } else if (instructionName.equals("MBAsciiToChar".toLowerCase())) {
+            a = (new ActionMBAsciiToChar());
+        } else if (instructionName.equals("MBCharToAscii".toLowerCase())) {
+            a = (new ActionMBCharToAscii());
+        } else if (instructionName.equals("MBStringExtract".toLowerCase())) {
+            a = (new ActionMBStringExtract());
+        } else if (instructionName.equals("MBStringLength".toLowerCase())) {
+            a = (new ActionMBStringLength());
+        } else if (instructionName.equals("Multiply".toLowerCase())) {
+            a = (new ActionMultiply());
+        } else if (instructionName.equals("Not".toLowerCase())) {
+            a = (new ActionNot());
+        } else if (instructionName.equals("Or".toLowerCase())) {
+            a = (new ActionOr());
+        } else if (instructionName.equals("Pop".toLowerCase())) {
+            a = (new ActionPop());
+        } else if (instructionName.equals("Push".toLowerCase())) {
+            a = (new ActionPush(lexer, constantPool));
+        } else if (instructionName.equals("RandomNumber".toLowerCase())) {
+            a = (new ActionRandomNumber());
+        } else if (instructionName.equals("RemoveSprite".toLowerCase())) {
+            a = (new ActionRemoveSprite());
+        } else if (instructionName.equals("SetProperty".toLowerCase())) {
+            a = (new ActionSetProperty());
+        } else if (instructionName.equals("SetTarget2".toLowerCase())) {
+            a = (new ActionSetTarget2());
+        } else if (instructionName.equals("SetVariable".toLowerCase())) {
+            a = (new ActionSetVariable());
+        } else if (instructionName.equals("StartDrag".toLowerCase())) {
+            a = (new ActionStartDrag());
+        } else if (instructionName.equals("StringAdd".toLowerCase())) {
+            a = (new ActionStringAdd());
+        } else if (instructionName.equals("StringEquals".toLowerCase())) {
+            a = (new ActionStringEquals());
+        } else if (instructionName.equals("StringExtract".toLowerCase())) {
+            a = (new ActionStringExtract());
+        } else if (instructionName.equals("StringLength".toLowerCase())) {
+            a = (new ActionStringLength());
+        } else if (instructionName.equals("StringLess".toLowerCase())) {
+            a = (new ActionStringLess());
+        } else if (instructionName.equals("Subtract".toLowerCase())) {
+            a = (new ActionSubtract());
+        } else if (instructionName.equals("ToInteger".toLowerCase())) {
+            a = (new ActionToInteger());
+        } else if (instructionName.equals("Trace".toLowerCase())) {
+            a = (new ActionTrace());
+        } else if (instructionName.equals("WaitForFrame2".toLowerCase())) {
+            a = (new ActionWaitForFrame2(lexer));
+        } else if (instructionName.equals("Add2".toLowerCase())) {
+            a = (new ActionAdd2());
+        } else if (instructionName.equals("BitAnd".toLowerCase())) {
+            a = (new ActionBitAnd());
+        } else if (instructionName.equals("BitLShift".toLowerCase())) {
+            a = (new ActionBitLShift());
+        } else if (instructionName.equals("BitOr".toLowerCase())) {
+            a = (new ActionBitOr());
+        } else if (instructionName.equals("BitRShift".toLowerCase())) {
+            a = (new ActionBitRShift());
+        } else if (instructionName.equals("BitURShift".toLowerCase())) {
+            a = (new ActionBitURShift());
+        } else if (instructionName.equals("BitXor".toLowerCase())) {
+            a = (new ActionBitXor());
+        } else if (instructionName.equals("CallFunction".toLowerCase())) {
+            a = (new ActionCallFunction());
+        } else if (instructionName.equals("CallMethod".toLowerCase())) {
+            a = (new ActionCallMethod());
+        } else if (instructionName.equals("ConstantPool".toLowerCase())) {
+            a = new ActionConstantPool(lexer);
+        } else if (instructionName.equals("Decrement".toLowerCase())) {
+            a = (new ActionDecrement());
+        } else if (instructionName.equals("DefineFunction".toLowerCase())) {
+            a = (new ActionDefineFunction(lexer));
+        } else if (instructionName.equals("DefineLocal".toLowerCase())) {
+            a = (new ActionDefineLocal());
+        } else if (instructionName.equals("DefineLocal2".toLowerCase())) {
+            a = (new ActionDefineLocal2());
+        } else if (instructionName.equals("Delete".toLowerCase())) {
+            a = (new ActionDelete());
+        } else if (instructionName.equals("Delete2".toLowerCase())) {
+            a = (new ActionDelete2());
+        } else if (instructionName.equals("Enumerate".toLowerCase())) {
+            a = (new ActionEnumerate());
+        } else if (instructionName.equals("Equals2".toLowerCase())) {
+            a = (new ActionEquals2());
+        } else if (instructionName.equals("GetMember".toLowerCase())) {
+            a = (new ActionGetMember());
+        } else if (instructionName.equals("Increment".toLowerCase())) {
+            a = (new ActionIncrement());
+        } else if (instructionName.equals("InitArray".toLowerCase())) {
+            a = (new ActionInitArray());
+        } else if (instructionName.equals("InitObject".toLowerCase())) {
+            a = (new ActionInitObject());
+        } else if (instructionName.equals("Less2".toLowerCase())) {
+            a = (new ActionLess2());
+        } else if (instructionName.equals("Modulo".toLowerCase())) {
+            a = (new ActionModulo());
+        } else if (instructionName.equals("NewMethod".toLowerCase())) {
+            a = (new ActionNewMethod());
+        } else if (instructionName.equals("NewObject".toLowerCase())) {
+            a = (new ActionNewObject());
+        } else if (instructionName.equals("PushDuplicate".toLowerCase())) {
+            a = (new ActionPushDuplicate());
+        } else if (instructionName.equals("Return".toLowerCase())) {
+            a = (new ActionReturn());
+        } else if (instructionName.equals("SetMember".toLowerCase())) {
+            a = (new ActionSetMember());
+        } else if (instructionName.equals("StackSwap".toLowerCase())) {
+            a = (new ActionStackSwap());
+        } else if (instructionName.equals("StoreRegister".toLowerCase())) {
+            a = (new ActionStoreRegister(lexer));
+        } else if (instructionName.equals("TargetPath".toLowerCase())) {
+            a = (new ActionTargetPath());
+        } else if (instructionName.equals("ToNumber".toLowerCase())) {
+            a = (new ActionToNumber());
+        } else if (instructionName.equals("ToString".toLowerCase())) {
+            a = (new ActionToString());
+        } else if (instructionName.equals("TypeOf".toLowerCase())) {
+            a = (new ActionTypeOf());
+        } else if (instructionName.equals("With".toLowerCase())) {
+            a = (new ActionWith(lexer));
+        } else if (instructionName.equals("Enumerate2".toLowerCase())) {
+            a = (new ActionEnumerate2());
+        } else if (instructionName.equals("Greater".toLowerCase())) {
+            a = (new ActionGreater());
+        } else if (instructionName.equals("InstanceOf".toLowerCase())) {
+            a = (new ActionInstanceOf());
+        } else if (instructionName.equals("StrictEquals".toLowerCase())) {
+            a = (new ActionStrictEquals());
+        } else if (instructionName.equals("StringGreater".toLowerCase())) {
+            a = (new ActionStringGreater());
+        } else if (instructionName.equals("CastOp".toLowerCase())) {
+            a = (new ActionCastOp());
+        } else if (instructionName.equals("DefineFunction2".toLowerCase())) {
+            a = (new ActionDefineFunction2(lexer));
+        } else if (instructionName.equals("Extends".toLowerCase())) {
+            a = (new ActionExtends());
+        } else if (instructionName.equals("ImplementsOp".toLowerCase())) {
+            a = (new ActionImplementsOp());
+        } else if (instructionName.equals("Throw".toLowerCase())) {
+            a = (new ActionThrow());
+        } else if (instructionName.equals("Try".toLowerCase())) {
+            a = (new ActionTry(lexer, version));
+        } else if (instructionName.equals("FSCommand2".toLowerCase())) {
+            a = (new ActionFSCommand2());
+        } else if (instructionName.equals("StrictMode".toLowerCase())) {
+            a = (new ActionStrictMode(lexer));
+        } else if (instructionName.equals("Nop".toLowerCase())) {
+            a = (new ActionNop());
+        } else if (instructionName.equals("FFDec_DeobfuscatePop".toLowerCase())) {
+            a = (new ActionDeobfuscatePop());
+        } else {
+            throw new ParseException("Unknown instruction name :" + instructionName, lexer.yyline());
+        }
+        return a;
+    }
+    
+    private static List<Action> parseAllActions(FlasmLexer lexer, int version) throws IOException, ParseException {
+        List<Action> list = new ArrayList<>();
+        Stack<GraphSourceItemContainer> containers = new Stack<>();
+        List<String> emptyList = new ArrayList<>();
+        while (true) {
+            ASMParsedSymbol symb = lexer.yylex();
+            if (symb.type == ASMParsedSymbol.TYPE_BLOCK_END) {
+                if (containers.isEmpty()) {
+                    throw new ParseException("Block end without start", lexer.yyline());
+                }
+                GraphSourceItemContainer a = containers.peek();
+                if (!a.parseDivision(0, lexer)) {
+                    containers.pop();
+                }
+            } else if (symb.type == ASMParsedSymbol.TYPE_INSTRUCTION_NAME) {
+                String instructionName = ((String) symb.value).toLowerCase();
+                Action a = parseAction(instructionName, lexer, emptyList, version);
+                if (a instanceof GraphSourceItemContainer) {
+                    containers.push((GraphSourceItemContainer) a);
+                }
+                if (a != null) {
+                    list.add(a);
+                }
+            } else if ((symb.type == ASMParsedSymbol.TYPE_BLOCK_END) || (symb.type == ASMParsedSymbol.TYPE_EOF)) {
+                return list;
+            }
+        }
+    }
+
+    public static List<Action> parse(long address, long containerSWFOffset, boolean ignoreNops, String source, int version) throws IOException, ParseException {
+        FlasmLexer lexer = new FlasmLexer(new StringReader(source));
+        List<Action> list = parseAllActions(lexer, version);
+        
+        List<String> constantPool = new ArrayList<>();
+        for(Action a : list) {
+            if (a instanceof ActionConstantPool) {
+                constantPool.addAll(((ActionConstantPool) a).constantPool);
+            }
+        }
+        
+        lexer = new FlasmLexer(new StringReader(source));
         List<Label> labels = new ArrayList<>();
-        List<Action> ret = parse(containerSWFOffset, ignoreNops, labels, address, lexer, new ArrayList<String>(), version);
+        List<Action> ret = parse(containerSWFOffset, ignoreNops, labels, address, lexer, constantPool, version);
         List<Action> links = Action.getActionsAllIfsOrJumps(ret);
         //Action.setActionsAddresses(ret, address, version);
         for (Action link : links) {
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionWaitForFrame.java b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionWaitForFrame.java
index 9f336deca..ff0381351 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionWaitForFrame.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/swf3/ActionWaitForFrame.java
@@ -23,12 +23,14 @@ import com.jpexs.decompiler.flash.SWFInputStream;
 import com.jpexs.decompiler.flash.SWFOutputStream;
 import com.jpexs.decompiler.flash.action.Action;
 import com.jpexs.decompiler.flash.action.ActionGraph;
+import com.jpexs.decompiler.flash.action.model.ConstantPool;
 import com.jpexs.decompiler.flash.action.model.DirectValueActionItem;
 import com.jpexs.decompiler.flash.action.model.clauses.IfFrameLoadedActionItem;
 import com.jpexs.decompiler.flash.action.parser.ParseException;
 import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer;
 import com.jpexs.decompiler.flash.action.special.ActionEnd;
 import com.jpexs.decompiler.flash.action.special.ActionStore;
+import com.jpexs.decompiler.flash.action.swf4.ActionPush;
 import com.jpexs.decompiler.graph.GraphSourceItem;
 import com.jpexs.decompiler.graph.GraphTargetItem;
 import java.io.ByteArrayInputStream;
@@ -45,13 +47,13 @@ public class ActionWaitForFrame extends Action implements ActionStore {
     public int skipCount;
     public List<Action> skipped;
 
-    public ActionWaitForFrame(SWFInputStream sis) throws IOException {
+    public ActionWaitForFrame(SWFInputStream sis, ConstantPool cpool) throws IOException {
         super(0x8A, 3);
         frame = sis.readUI16();
         skipCount = sis.readUI8();
         skipped = new ArrayList<>();
         for (int i = 0; i < skipCount; i++) {
-            Action a = sis.readAction();
+            Action a = sis.readAction(cpool);
             if (a instanceof ActionEnd) {
                 skipCount = i;
                 break;
@@ -60,6 +62,12 @@ public class ActionWaitForFrame extends Action implements ActionStore {
                 skipCount = i;
                 break;
             }
+            if (a instanceof ActionPush) {
+                if (cpool != null) {
+                    ((ActionPush) a).constantPool = cpool.constants;
+                    cpool.count++;
+                }
+            }
             skipped.add(a);
         }
         boolean deobfuscate = Configuration.getConfig("autoDeobfuscate", true);
@@ -70,7 +78,7 @@ public class ActionWaitForFrame extends Action implements ActionStore {
             }
             baos.write(new ActionEnd().getBytes(sis.getVersion()));
             SWFInputStream sis2 = new SWFInputStream(new ByteArrayInputStream(baos.toByteArray()), sis.getVersion());
-            skipped = sis2.readActionList(new ArrayList<DisassemblyListener>(), 0, 0, "");
+            skipped = sis2.readActionList(new ArrayList<DisassemblyListener>(), 0, "");
             if (!skipped.isEmpty()) {
                 if (skipped.get(skipped.size() - 1) instanceof ActionEnd) {
                     skipped.remove(skipped.size() - 1);
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java
index f87bbd8c4..b84ecc863 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java
@@ -199,7 +199,7 @@ public class ActionPush extends Action {
                     if (constantPool.contains((String) symb.value)) {
                         values.add(new ConstantIndex(constantPool.indexOf(symb.value), constantPool));
                     } else {
-                        values.add(symb.value);
+                    values.add(symb.value);
                     }
                     break;
                 case ASMParsedSymbol.TYPE_FLOAT:
@@ -223,12 +223,10 @@ public class ActionPush extends Action {
                     break;
                 default:
                     throw new ParseException("Arguments expected, " + symb.type + " " + symb.value + " found", lexer.yyline());
-
-
             }
         }
     }
-
+    
     @Override
     public String getASMSourceReplaced(List<? extends GraphSourceItem> container, List<Long> knownAddreses, List<String> constantPool, int version, boolean hex, boolean highlight) {
         if (replacement == null || replacement.size() < values.size()) {
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionWaitForFrame2.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionWaitForFrame2.java
index 865623b0a..d9d2031bc 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionWaitForFrame2.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionWaitForFrame2.java
@@ -23,6 +23,7 @@ import com.jpexs.decompiler.flash.SWFInputStream;
 import com.jpexs.decompiler.flash.SWFOutputStream;
 import com.jpexs.decompiler.flash.action.Action;
 import com.jpexs.decompiler.flash.action.ActionGraph;
+import com.jpexs.decompiler.flash.action.model.ConstantPool;
 import com.jpexs.decompiler.flash.action.model.clauses.IfFrameLoadedActionItem;
 import com.jpexs.decompiler.flash.action.parser.ParseException;
 import com.jpexs.decompiler.flash.action.parser.pcode.FlasmLexer;
@@ -59,12 +60,12 @@ public class ActionWaitForFrame2 extends Action implements ActionStore {
         skipCount = store.size();
     }
 
-    public ActionWaitForFrame2(SWFInputStream sis) throws IOException {
+    public ActionWaitForFrame2(SWFInputStream sis, ConstantPool cpool) throws IOException {
         super(0x8D, 1);
         skipCount = sis.readUI8();
         skipped = new ArrayList<>();
         for (int i = 0; i < skipCount; i++) {
-            Action a = sis.readAction();
+            Action a = sis.readAction(cpool);
             if (a instanceof ActionEnd) {
                 skipCount = i;
                 break;
@@ -83,7 +84,7 @@ public class ActionWaitForFrame2 extends Action implements ActionStore {
             }
             baos.write(new ActionEnd().getBytes(sis.getVersion()));
             SWFInputStream sis2 = new SWFInputStream(new ByteArrayInputStream(baos.toByteArray()), sis.getVersion());
-            skipped = sis2.readActionList(new ArrayList<DisassemblyListener>(), 0, 0, "");
+            skipped = sis2.readActionList(new ArrayList<DisassemblyListener>(), 0, "");
             if (!skipped.isEmpty()) {
                 if (skipped.get(skipped.size() - 1) instanceof ActionEnd) {
                     skipped.remove(skipped.size() - 1);
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineFunction.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineFunction.java
index ae18f0cef..76beeb76a 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineFunction.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineFunction.java
@@ -75,7 +75,7 @@ public class ActionDefineFunction extends Action implements GraphSourceItemConta
         //rri.setPos(posBef2 + codeSize);
     }
 
-    public ActionDefineFunction(long containerSWFPos, boolean ignoreNops, List<Label> labels, long address, FlasmLexer lexer, List<String> constantPool, int version) throws IOException, ParseException {
+    public ActionDefineFunction(FlasmLexer lexer) throws IOException, ParseException {
         super(0x9B, -1);
         functionName = lexString(lexer);
         int numParams = (int) lexLong(lexer);
@@ -83,7 +83,6 @@ public class ActionDefineFunction extends Action implements GraphSourceItemConta
             paramNames.add(lexString(lexer));
         }
         lexBlockOpen(lexer);
-        //code = ASMParser.parse(containerSWFPos + getHeaderLength(), ignoreNops, labels, address + getPreLen(version), lexer, constantPool, version);
     }
 
     @Override
@@ -216,8 +215,8 @@ public class ActionDefineFunction extends Action implements GraphSourceItemConta
     }
 
     @Override
-    public boolean parseDivision(int pos, long addr, FlasmLexer lexer) {
-        codeSize = (int) (addr - getAddress() - getHeaderSize());
+    public boolean parseDivision(long size, FlasmLexer lexer) {
+        codeSize = (int) (size - getHeaderSize());
         return false;
     }
 
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionWith.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionWith.java
index c3fb6b2ca..a55b68c0a 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionWith.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionWith.java
@@ -45,8 +45,8 @@ public class ActionWith extends Action implements GraphSourceItemContainer {
     }
 
     @Override
-    public boolean parseDivision(int pos, long addr, FlasmLexer lexer) {
-        codeSize = (int) (addr - getAddress() - getHeaderSize());
+    public boolean parseDivision(long size, FlasmLexer lexer) {
+        codeSize = (int) (size - getHeaderSize());
         return false;
     }
 
@@ -56,10 +56,9 @@ public class ActionWith extends Action implements GraphSourceItemContainer {
         this.version = version;
     }
 
-    public ActionWith(long containerSWFPos, boolean ignoreNops, List<Label> labels, long address, FlasmLexer lexer, List<String> constantPool, int version) throws IOException, ParseException {
+    public ActionWith(FlasmLexer lexer) throws IOException, ParseException {
         super(0x94, 2);
         lexBlockOpen(lexer);
-        //actions = ASMParser.parse(containerSWFPos + 2, ignoreNops, labels, address + 5, lexer, constantPool, version);
     }
 
     @Override
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionDefineFunction2.java b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionDefineFunction2.java
index 9373bc8a1..70c28a806 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionDefineFunction2.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionDefineFunction2.java
@@ -107,7 +107,7 @@ public class ActionDefineFunction2 extends Action implements GraphSourceItemCont
         //rri.setPos(posBef2 + codeSize);
     }
 
-    public ActionDefineFunction2(long containerSWFPos, boolean ignoreNops, List<Label> labels, long address, FlasmLexer lexer, List<String> constantPool, int version) throws IOException, ParseException {
+    public ActionDefineFunction2(FlasmLexer lexer) throws IOException, ParseException {
         super(0x8E, -1);
         functionName = lexString(lexer);
         int numParams = (int) lexLong(lexer);
@@ -126,7 +126,6 @@ public class ActionDefineFunction2 extends Action implements GraphSourceItemCont
             paramNames.add(lexString(lexer));
         }
         lexBlockOpen(lexer);
-        //code = ASMParser.parse(containerSWFPos + getHeaderLength(), ignoreNops, labels, address + getPreLen(version), lexer, constantPool, version);
     }
 
     @Override
@@ -364,8 +363,8 @@ public class ActionDefineFunction2 extends Action implements GraphSourceItemCont
     }
 
     @Override
-    public boolean parseDivision(int pos, long addr, FlasmLexer lexer) {
-        codeSize = (int) (addr - getAddress() - getHeaderSize());
+    public boolean parseDivision(long size, FlasmLexer lexer) {
+        codeSize = (int) (size - getHeaderSize());
         return false;
     }
 
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionTry.java b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionTry.java
index b5607abc2..0abb59827 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionTry.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionTry.java
@@ -110,7 +110,7 @@ public class ActionTry extends Action implements GraphSourceItemContainer {
         return surroundWithAction(baos.toByteArray(), version);
     }
 
-    public ActionTry(long containerSWFPos, boolean ignoreNops, List<Label> labels, long address, FlasmLexer lexer, List<String> constantPool, int version) throws IOException, ParseException {
+    public ActionTry(FlasmLexer lexer, int version) throws IOException, ParseException {
         super(0x8F, 0);
         this.version = version;
 
@@ -216,13 +216,13 @@ public class ActionTry extends Action implements GraphSourceItemContainer {
     }
 
     @Override
-    public boolean parseDivision(int pos, long addr, FlasmLexer lexer) {
+    public boolean parseDivision(long size, FlasmLexer lexer) {
         try {
             ASMParsedSymbol symb = lexer.yylex();
             //catchBlockFlag = false;
             if (symb.type == ASMParsedSymbol.TYPE_INSTRUCTION_NAME) {
                 if (((String) symb.value).toLowerCase().equals("catch")) {
-                    trySize = addr - getAddress() - getHeaderSize();
+                    trySize = size - getHeaderSize();
                     catchBlockFlag = true;
                     lexBlockOpen(lexer);
                     return true;
@@ -230,9 +230,9 @@ public class ActionTry extends Action implements GraphSourceItemContainer {
                 if (symb.type == ASMParsedSymbol.TYPE_INSTRUCTION_NAME) {
                     if (((String) symb.value).toLowerCase().equals("finally")) {
                         if (catchBlockFlag) {
-                            catchSize = addr - getAddress() - getHeaderSize() - trySize;
+                            catchSize = size - getHeaderSize() - trySize;
                         } else {
-                            trySize = addr - getAddress() - getHeaderSize();
+                            trySize = size - getHeaderSize();
                         }
                         finallyBlockFlag = true;
                         lexBlockOpen(lexer);
@@ -252,9 +252,9 @@ public class ActionTry extends Action implements GraphSourceItemContainer {
         }
 
         if (finallyBlockFlag) {
-            finallySize = addr - getAddress() - getHeaderSize() - trySize - catchSize;
+            finallySize = size - getHeaderSize() - trySize - catchSize;
         } else if (catchBlockFlag) {
-            catchSize = addr - getAddress() - getHeaderSize() - trySize;
+            catchSize = size - getHeaderSize() - trySize;
         }
         lexer.yybegin(0);
         return false;
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java b/trunk/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java
index 8b1a0554b..d8681ea09 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java
@@ -646,7 +646,7 @@ public class ActionPanel extends JPanel implements ActionListener {
             setHex(hexButton.isSelected());
         } else if (e.getActionCommand().equals("SAVEACTION")) {
             try {
-                src.setActions(ASMParser.parse(0, src.getPos(), true, new StringReader(editor.getText()), SWF.DEFAULT_VERSION), SWF.DEFAULT_VERSION);
+                src.setActions(ASMParser.parse(0, src.getPos(), true, editor.getText(), SWF.DEFAULT_VERSION), SWF.DEFAULT_VERSION);
                 setSource(this.src, false);
                 View.showMessageDialog(this, translate("message.action.saved"));
                 saveButton.setVisible(false);
diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonTag.java
index 9ba9e1b08..026453feb 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonTag.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonTag.java
@@ -170,7 +170,7 @@ public class DefineButtonTag extends CharacterTag implements ASMSource, BoundedT
             rri.setPos(prevLength);
 
             boolean deobfuscate = Configuration.getConfig("autoDeobfuscate", true);
-            List<Action> list = SWFInputStream.readActionList(listeners, 0, getPos() + hdrSize - prevLength, rri, version, prevLength, -1, toString()/*FIXME?*/);
+            List<Action> list = SWFInputStream.readActionList(listeners, getPos() + hdrSize - prevLength, rri, version, prevLength, -1, toString()/*FIXME?*/);
             if (deobfuscate) {
                 list = Action.removeNops(0, list, version, getPos() + hdrSize, toString()/*FIXME?*/);
             }
diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DoActionTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DoActionTag.java
index e5d762900..68c847df4 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/DoActionTag.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/DoActionTag.java
@@ -116,7 +116,7 @@ public class DoActionTag extends Tag implements ASMSource {
             ReReadableInputStream rri = new ReReadableInputStream(new ByteArrayInputStream(baos.toByteArray()));
             rri.setPos(prevLength);
             boolean deobfuscate = Configuration.getConfig("autoDeobfuscate", true);
-            List<Action> list = SWFInputStream.readActionList(listeners, 0, getPos() - prevLength, rri, version, prevLength, -1, toString()/*FIXME?*/);
+            List<Action> list = SWFInputStream.readActionList(listeners, getPos() - prevLength, rri, version, prevLength, -1, toString()/*FIXME?*/);
             if (deobfuscate) {
                 list = Action.removeNops(0, list, version, getPos(), toString()/*FIXME?*/);
             }
diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java
index 2a16736b8..910c33107 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java
@@ -125,7 +125,7 @@ public class DoInitActionTag extends CharacterIdTag implements ASMSource {
             ReReadableInputStream rri = new ReReadableInputStream(new ByteArrayInputStream(baos.toByteArray()));
             rri.setPos(prevLength);
             boolean deobfuscate = Configuration.getConfig("autoDeobfuscate", true);
-            List<Action> list = SWFInputStream.readActionList(listeners, 0, getPos() + 2 - prevLength, rri, version, prevLength, -1, toString()/*FIXME?*/);
+            List<Action> list = SWFInputStream.readActionList(listeners, getPos() + 2 - prevLength, rri, version, prevLength, -1, toString()/*FIXME?*/);
             if (deobfuscate) {
                 list = Action.removeNops(0, list, version, getPos() + 2, toString()/*FIXME?*/);
             }
diff --git a/trunk/src/com/jpexs/decompiler/flash/types/BUTTONCONDACTION.java b/trunk/src/com/jpexs/decompiler/flash/types/BUTTONCONDACTION.java
index 5c6167941..5d85fe9f8 100644
--- a/trunk/src/com/jpexs/decompiler/flash/types/BUTTONCONDACTION.java
+++ b/trunk/src/com/jpexs/decompiler/flash/types/BUTTONCONDACTION.java
@@ -170,7 +170,7 @@ public class BUTTONCONDACTION implements ASMSource, Exportable {
     public List<Action> getActions(int version) {
         try {
             boolean deobfuscate = Configuration.getConfig("autoDeobfuscate", true);
-            List<Action> list = SWFInputStream.readActionList(listeners, 0, getPos() + 4, new ReReadableInputStream(new ByteArrayInputStream(actionBytes)), version, 0, -1, toString()/*FIXME?*/);
+            List<Action> list = SWFInputStream.readActionList(listeners, getPos() + 4, new ReReadableInputStream(new ByteArrayInputStream(actionBytes)), version, 0, -1, toString()/*FIXME?*/);
             if (deobfuscate) {
                 list = Action.removeNops(0, list, version, getPos() + 4, toString()/*FIXME?*/);
             }
diff --git a/trunk/src/com/jpexs/decompiler/flash/types/CLIPACTIONRECORD.java b/trunk/src/com/jpexs/decompiler/flash/types/CLIPACTIONRECORD.java
index d4128c1f6..edcb5071f 100644
--- a/trunk/src/com/jpexs/decompiler/flash/types/CLIPACTIONRECORD.java
+++ b/trunk/src/com/jpexs/decompiler/flash/types/CLIPACTIONRECORD.java
@@ -168,7 +168,7 @@ public class CLIPACTIONRECORD implements ASMSource, Exportable {
     public List<Action> getActions(int version) {
         try {
             boolean deobfuscate = Configuration.getConfig("autoDeobfuscate", true);
-            List<Action> list = SWFInputStream.readActionList(listeners, 0, getPos() + hdrPos, new ReReadableInputStream(new ByteArrayInputStream(actionBytes)), version, 0, -1, toString()/*FIXME?*/);
+            List<Action> list = SWFInputStream.readActionList(listeners, getPos() + hdrPos, new ReReadableInputStream(new ByteArrayInputStream(actionBytes)), version, 0, -1, toString()/*FIXME?*/);
             if (deobfuscate) {
                 list = Action.removeNops(0, list, version, getPos() + hdrPos, toString()/*FIXME?*/);
             }
diff --git a/trunk/src/com/jpexs/decompiler/graph/GraphSourceItemContainer.java b/trunk/src/com/jpexs/decompiler/graph/GraphSourceItemContainer.java
index 5f80c078a..18babfec1 100644
--- a/trunk/src/com/jpexs/decompiler/graph/GraphSourceItemContainer.java
+++ b/trunk/src/com/jpexs/decompiler/graph/GraphSourceItemContainer.java
@@ -33,7 +33,7 @@ public interface GraphSourceItemContainer {
 
     public String getASMSourceBetween(int pos);
 
-    public boolean parseDivision(int pos, long addr, FlasmLexer lexer);
+    public boolean parseDivision(long size, FlasmLexer lexer);
 
     public HashMap<Integer, String> getRegNames();
 
diff --git a/trunk/test/com/jpexs/decompiler/flash/ActionScript2AssemblerTest.java b/trunk/test/com/jpexs/decompiler/flash/ActionScript2AssemblerTest.java
index acdc004d1..109fa2452 100644
--- a/trunk/test/com/jpexs/decompiler/flash/ActionScript2AssemblerTest.java
+++ b/trunk/test/com/jpexs/decompiler/flash/ActionScript2AssemblerTest.java
@@ -52,7 +52,7 @@ public class ActionScript2AssemblerTest {
             "Jump loc000d\n" +
             "loc002f:";
         try {
-            List<Action> actions = ASMParser.parse(0, 0, true, new StringReader(actionsString), swf.version);
+            List<Action> actions = ASMParser.parse(0, 0, true, actionsString, swf.version);
 
             DoActionTag doa = getFirstActionTag();
             doa.setActionBytes(Action.actionsToBytes(actions, true, swf.version));