diff --git a/trunk/src/com/jpexs/decompiler/flash/SWF.java b/trunk/src/com/jpexs/decompiler/flash/SWF.java
index 8f4bf0c14..329f5e773 100644
--- a/trunk/src/com/jpexs/decompiler/flash/SWF.java
+++ b/trunk/src/com/jpexs/decompiler/flash/SWF.java
@@ -19,7 +19,7 @@ package com.jpexs.decompiler.flash;
 import SevenZip.Compression.LZMA.Encoder;
 import com.jpexs.decompiler.flash.action.Action;
 import com.jpexs.decompiler.flash.action.ActionGraphSource;
-import com.jpexs.decompiler.flash.action.special.ActionContainer;
+import com.jpexs.decompiler.flash.graph.GraphSourceItemContainer;
 import com.jpexs.decompiler.flash.action.swf4.ActionEquals;
 import com.jpexs.decompiler.flash.action.swf4.ActionGetVariable;
 import com.jpexs.decompiler.flash.action.swf4.ActionIf;
@@ -977,8 +977,8 @@ public class SWF {
                 functions.add(ins);
             }
 
-            if (ins instanceof ActionContainer) {
-                getVariables(variables, functions, new ActionGraphSource(((ActionContainer) ins).getActions(), code.version, new HashMap<Integer, String>(), new HashMap<String, GraphTargetItem>(), new HashMap<String, GraphTargetItem>()), 0);
+            if (ins instanceof GraphSourceItemContainer) {
+                //getVariables(variables, functions, new ActionGraphSource(((ActionContainer) ins).getActions(), code.version, new HashMap<Integer, String>(), new HashMap<String, GraphTargetItem>(), new HashMap<String, GraphTargetItem>()), 0);
             }
 
             if ((ins instanceof ActionSetVariable) || (ins instanceof ActionSetMember) || (ins instanceof ActionDefineLocal)) {
@@ -1042,7 +1042,9 @@ public class SWF {
         HashMap<DirectValueTreeItem, ConstantPool> ret = new HashMap<DirectValueTreeItem, ConstantPool>();
         List<Action> actions = src.getActions(version);
         actionsMap.put(src, actions);
-        getVariables(variables, functions, new ActionGraphSource(actions, version, new HashMap<Integer, String>(), new HashMap<String, GraphTargetItem>(), new HashMap<String, GraphTargetItem>()), 0);
+        List<GraphSourceItem> ss=new ArrayList<GraphSourceItem>();
+        ss.addAll(actions);
+        getVariables(variables, functions, new ActionGraphSource(ss, version, new HashMap<Integer, String>(), new HashMap<String, GraphTargetItem>(), new HashMap<String, GraphTargetItem>()), 0);
         return ret;
     }
     private HashMap<ASMSource, List<Action>> actionsMap = new HashMap<ASMSource, List<Action>>();
diff --git a/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java b/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java
index 15cbe0e73..3a62f5791 100644
--- a/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java
+++ b/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java
@@ -18,7 +18,7 @@ package com.jpexs.decompiler.flash;
 
 import com.jpexs.decompiler.flash.action.Action;
 import com.jpexs.decompiler.flash.action.ActionGraphSource;
-import com.jpexs.decompiler.flash.action.special.ActionContainer;
+import com.jpexs.decompiler.flash.graph.GraphSourceItemContainer;
 import com.jpexs.decompiler.flash.action.special.ActionEnd;
 import com.jpexs.decompiler.flash.action.special.ActionNop;
 import com.jpexs.decompiler.flash.action.swf3.*;
@@ -496,9 +496,9 @@ public class SWFInputStream extends InputStream {
         return readActionList(address, containerSWFOffset, rri, version, rri.getPos(), rri.getPos() + maxlen);
     }
 
-    private static void getConstantPool(ConstantPool cpool, List localData, Stack<GraphTargetItem> stack, List<GraphTargetItem> output, ActionGraphSource code, int ip, int lastIp, List<ConstantPool> constantPools, List<Integer> visited, int version) {
+    private static void getConstantPool(ConstantPool cpool, List localData, Stack<GraphTargetItem> stack, List<GraphTargetItem> output, ActionGraphSource code, int ip, int lastIp, List<ConstantPool> constantPools, List<Integer> visited, int version, int endIp) {
         boolean debugMode = false;
-        while ((ip > -1) && ip < code.size()) {
+        while (((endIp==-1)||(endIp>ip))&&(ip > -1) && ip < code.size()) {
             if (visited.contains(ip)) {
                 break;
             }
@@ -510,6 +510,17 @@ public class SWFInputStream extends InputStream {
                 continue;
             }
 
+            if(ins instanceof GraphSourceItemContainer){
+                GraphSourceItemContainer cnt=(GraphSourceItemContainer)ins;
+                long endAddr=((GraphSourceItemContainer)ins).getEndAddress();
+                int nendIp = code.adr2pos(endAddr);
+                List localData2 = Helper.toList(new HashMap<Integer, String>(), new HashMap<String, GraphTargetItem>(), new HashMap<String, GraphTargetItem>());
+                List<GraphTargetItem> output2=new ArrayList<GraphTargetItem>();
+                getConstantPool(cpool, localData2, new Stack<GraphTargetItem>(), output2, code, ip+1, lastIp, constantPools, visited, version,nendIp);
+                cnt.translateContainer(output2, stack, output,(HashMap<Integer, String>) localData.get(0),(HashMap<String, GraphTargetItem>)localData.get(1),(HashMap<String, GraphTargetItem>)localData.get(2));
+                ip = nendIp;
+                continue;
+            }
             if (ins instanceof ActionPush) {
                 if (cpool != null) {
                     ((ActionPush) ins).constantPool = cpool.constants;
@@ -518,18 +529,21 @@ public class SWFInputStream extends InputStream {
             }
             if (ins instanceof ActionDefineFunction) {
                 if (cpool != null) {
-                    ((ActionDefineFunction) ins).setConstantPool(cpool.constants);
+                    //((ActionDefineFunction) ins).setConstantPool(cpool.constants,code.getActions());
                     cpool.count++;
                 }
             }
             if (ins instanceof ActionDefineFunction2) {
                 if (cpool != null) {
-                    ((ActionDefineFunction2) ins).setConstantPool(cpool.constants);
+                    //((ActionDefineFunction2) ins).setConstantPool(cpool.constants,code.getActions());
                     cpool.count++;
                 }
             }
             if (debugMode) {
-                System.out.println("getConstantPool ip " + ip + ": " + ins + " stack:" + Highlighting.stripHilights(stack.toString()));
+                System.err.println("getConstantPool ip " + ip + ": " + ins + " stack:" + Helper.stackToString(stack,Helper.toList(cpool)));
+                if(ip==68){
+                    System.err.println("kok");
+                }
             }
             if (ins instanceof ActionConstantPool) {
                 constantPools.add(new ConstantPool(((ActionConstantPool) ins).constantPool));
@@ -584,13 +598,13 @@ public class SWFInputStream extends InputStream {
                     boolean condition = stack.peek().toBoolean();
                     if (debugMode) {
                         if (condition) {
-                            System.out.println("JUMP");
+                            System.err.println("JUMP");
                         } else {
-                            System.out.println("SKIP");
+                            System.err.println("SKIP");
                         }
                     }
                     stack.pop();
-                    getConstantPool(cpool, localData, stack, output, code, condition ? (code.adr2pos(((ActionIf) ins).getAddress() + ((ActionIf) ins).getBytes(code.version).length + ((ActionIf) ins).getJumpOffset())) : ip + 1, ip, constantPools, visited, version);
+                    getConstantPool(cpool, localData, stack, output, code, condition ? (code.adr2pos(((ActionIf) ins).getAddress() + ((ActionIf) ins).getBytes(code.version).length + ((ActionIf) ins).getJumpOffset())) : ip + 1, ip, constantPools, visited, version,endIp);
                 } else {
                     if (ins instanceof ActionIf) {
                         stack.pop();
@@ -600,7 +614,7 @@ public class SWFInputStream extends InputStream {
                     for (int b : branches) {
                         Stack<GraphTargetItem> brStack = (Stack<GraphTargetItem>) stack.clone();
                         if (b >= 0) {
-                            getConstantPool(cpool, localData, brStack, output, code, b, ip, constantPools, visited, version);
+                            getConstantPool(cpool, localData, brStack, output, code, b, ip, constantPools, visited, version,endIp);
                         } else {
                             if (debugMode) {
                                 System.out.println("Negative branch:" + b);
@@ -621,7 +635,7 @@ public class SWFInputStream extends InputStream {
         List<ConstantPool> ret = new ArrayList<ConstantPool>();
         List localData = Helper.toList(new HashMap<Integer, String>(), new HashMap<String, GraphTargetItem>(), new HashMap<String, GraphTargetItem>());
         try {
-            getConstantPool(null, localData, new Stack<GraphTargetItem>(), new ArrayList<GraphTargetItem>(), code, code.adr2pos(addr), 0, ret, new ArrayList<Integer>(), version);
+            getConstantPool(null, localData, new Stack<GraphTargetItem>(), new ArrayList<GraphTargetItem>(), code, code.adr2pos(addr), 0, ret, new ArrayList<Integer>(), version,-1);
         } catch (Exception ex) {
             log.log(Level.SEVERE, "Error during getting constantpool", ex);
         }
@@ -653,7 +667,7 @@ public class SWFInputStream extends InputStream {
          method = 2;
          goesPrev = readActionListAtPos(true, localData, stack, cpool, sis, rri, ip, retdups, ip);
          }*/
-        goesPrev = readActionListAtPos(address, containerSWFOffset, false, true, localData, stack, cpool, sis, rri, ip, retdups, ip, endip);
+        goesPrev = readActionListAtPos(new ArrayList<GraphTargetItem>(),new HashMap<Long,List<GraphSourceItemContainer>>(),address, containerSWFOffset, false, true, localData, stack, cpool, sis, rri, ip, retdups, ip, endip);
 
         if (goesPrev) {
         } else {
@@ -663,7 +677,7 @@ public class SWFInputStream extends InputStream {
                 }
             }
         }
-        List<Action> ret = new ArrayList<Action>();
+        List<GraphSourceItem> ret = new ArrayList<GraphSourceItem>();
         Action last = null;
         for (Action a : retdups) {
             if (a != last) {
@@ -692,8 +706,12 @@ public class SWFInputStream extends InputStream {
         if (goesPrev && (!DEOBFUSCATION_ALL_CODE_IN_PREVIOUS_TAG)) {
             ActionJump aj = new ActionJump(ip);
             int skip = aj.getBytes(version).length;
-            for (Action a : ret) {
+            for (GraphSourceItem s : ret) {
+                
+                if(s instanceof Action){
+                    Action a=(Action)s;
                 a.setAddress(a.getAddress() + skip, version);
+                }
             }
             ret.add(0, aj);
         }
@@ -708,41 +726,46 @@ public class SWFInputStream extends InputStream {
          } catch (ParseException ex) {
          Logger.getLogger(SWFInputStream.class.getName()).log(Level.SEVERE, "parsing error", ex);
          }*/
-        return ret;
+        List<Action> reta=new ArrayList<Action>();
+        for(Object o:ret){
+            if(o instanceof Action){
+                reta.add((Action)o);
+            }
+        }
+        return reta;
     }
 
-    private static boolean readActionListAtPos(long address, long containerSWFOffset, boolean notCompileTime, boolean enableVariables, List localData, Stack<GraphTargetItem> stack, ConstantPool cpool, SWFInputStream sis, ReReadableInputStream rri, int ip, List<Action> ret, int startIp, int endip) throws IOException {
+    private static boolean readActionListAtPos(List<GraphTargetItem> output,HashMap<Long,List<GraphSourceItemContainer>> containers,long address, long containerSWFOffset, boolean notCompileTime, boolean enableVariables, List localData, Stack<GraphTargetItem> stack, ConstantPool cpool, SWFInputStream sis, ReReadableInputStream rri, int ip, List<Action> ret, int startIp, int endip) throws IOException {
         boolean debugMode = false;
         boolean decideBranch = false;
         boolean retv = false;
         rri.setPos(ip);
         Action a;
-        List<GraphTargetItem> output = new ArrayList<GraphTargetItem>();
         long filePos = rri.getPos();
         Scanner sc = new Scanner(System.in);
         int prevIp = ip;
         while (((endip == -1) || (endip > ip)) && (a = sis.readAction(rri)) != null) {
-            if ((ip < ret.size()) && (!(ret.get(ip) instanceof ActionNop))) {
+            if ((ip < ret.size()) && (!(ret.get(ip) instanceof ActionNop))) {                
                 a = ret.get(ip);
+                if(a.getAddress()!=ip){                    
+                    new Exception("Jump to the middle of the instruction").printStackTrace();
+                }
             }
             a.containerSWFOffset = containerSWFOffset;
             a.setAddress(prevIp, SWF.DEFAULT_VERSION, false);
             int info = a.actionLength + 1 + ((a.actionCode > 0x80) ? 2 : 0);
             byte b[] = a.getBytes(sis.version);
-            int infoCorrect = info;
-            if (a instanceof ActionContainer) {
-                infoCorrect += ((ActionContainer) a).getDataLength();
-            }
+            int infoCorrect = info;            
             if (b.length != infoCorrect) {
                 //throw new RuntimeException("Wrong length "+a.toString()+" info:"+infoCorrect+" actual:"+b.length+" datalen:"+(infoCorrect-info));
             }
             int actual = 0;
-            if (a instanceof ActionContainer) {
-                actual = ((ActionContainer) a).getHeaderBytes().length;
+            if (a instanceof GraphSourceItemContainer) {
+                actual = ((GraphSourceItemContainer) a).getHeaderBytes().length;
             } else {
                 actual = a.getBytes(sis.version).length;
             }
-            if (!(a instanceof ActionContainer)) {
+            if (!(a instanceof GraphSourceItemContainer)) {
                 int change = info - (rri.getPos() - ip);
                 if (change > 0) {
                     a.afterInsert = new ActionJump(change);
@@ -766,25 +789,35 @@ public class SWFInputStream extends InputStream {
             }
             if (a instanceof ActionDefineFunction) {
                 if (cpool != null) {
-                    ((ActionDefineFunction) a).setConstantPool(cpool.constants);
+                    //((ActionDefineFunction) a).setConstantPool(cpool.constants);
                     cpool.count++;
                 }
             }
             if (a instanceof ActionDefineFunction2) {
                 if (cpool != null) {
-                    ((ActionDefineFunction2) a).setConstantPool(cpool.constants);
+                    //((ActionDefineFunction2) a).setConstantPool(cpool.constants);
                     cpool.count++;
                 }
             }
 
             if (debugMode) {
                 //if(a instanceof ActionIf){                
-                String atos = a.getASMSource(new ArrayList<Long>(), cpool.constants, sis.version, false);
-                if (a instanceof ActionContainer) {
+                String atos = a.getASMSource(new ArrayList<GraphSourceItem>(),new ArrayList<Long>(), cpool.constants, sis.version, false);
+                if (a instanceof GraphSourceItemContainer) {
                     atos = a.toString();
                 }
                 System.err.println("readActionListAtPos ip: " + (ip - startIp) + " (0x" + Helper.formatAddress(ip - startIp) + ") " + " action(len " + a.actionLength + "): " + atos + (a.isIgnored() ? " (ignored)" : "") + " stack:" + Helper.stackToString(stack, Helper.toList(cpool)) + " " + Helper.byteArrToString(a.getBytes(SWF.DEFAULT_VERSION)));
+                HashMap<String, GraphTargetItem> vars=(HashMap<String, GraphTargetItem>)localData.get(1);
+                System.err.print("variables: ");
+                for(String v:vars.keySet()){
+                    System.err.print("'"+v+"' = "+Highlighting.stripHilights(vars.get(v).toString(cpool))+", ");
+                }
+                System.err.println();
                 //}
+                if(ip - startIp==911){
+                    System.err.println("dd");
+                    //readActionListAtPos ip: 116 (0x0074)  action(len 2): If loc0125 ;compileTime stack:[!(
==734)] [9d 02 00 21 00]
+                }
                 String add = "";
                 if (a instanceof ActionIf) {
                     add = " change: " + ((ActionIf) a).getJumpOffset();
@@ -840,7 +873,7 @@ public class SWFInputStream extends InputStream {
                                 ((ActionIf) a).compileTime = true;
                             }
                             if (debugMode) {
-                                System.out.print("is compiletime -> ");
+                                System.err.print("is compiletime -> ");
                             }
                             if (top.toBoolean()) {
                                 newip = rri.getPos() + aif.getJumpOffset();
@@ -854,7 +887,7 @@ public class SWFInputStream extends InputStream {
                                     aif.compileTime = false;
                                 }
                                 if (debugMode) {
-                                    System.out.println("jump");
+                                    System.err.println("jump");
                                 }
                             } else {
                                 aif.ignoreUsed = true;
@@ -862,7 +895,7 @@ public class SWFInputStream extends InputStream {
                                     aif.compileTime = false;
                                 }
                                 if (debugMode) {
-                                    System.out.println("ignore");
+                                    System.err.println("ignore");
                                 }
                                 if (((!enableVariables) || (!top.isVariableComputed())) && (!aif.jumpUsed)) {
                                     //a = new ActionNop();
@@ -892,7 +925,7 @@ public class SWFInputStream extends InputStream {
 
                         } else {
                             if (debugMode) {
-                                System.out.println("goaif");
+                                System.err.println("goaif");
                             }
                             //throw new RuntimeException("goaif");
                             goaif = true;
@@ -902,14 +935,14 @@ public class SWFInputStream extends InputStream {
                         //if(newip>=0){
                         //rri.setPos(newip);
                         //}
-                    } else {
+                    } else if(!(a instanceof GraphSourceItemContainer)){
                         //return in for..in,   TODO:Handle this better way
                         if (((a instanceof ActionEquals) || (a instanceof ActionEquals2)) && (stack.size() == 1) && (stack.peek() instanceof DirectValueTreeItem)) {
                             stack.push(new DirectValueTreeItem(null, 0, new Null(), new ArrayList<String>()));
                         }
                         if ((a instanceof ActionStoreRegister) && stack.isEmpty()) {
                             stack.push(new DirectValueTreeItem(null, 0, new Null(), new ArrayList<String>()));
-                        }
+                        }                        
                         a.translate(localData, stack, output);
                     }
                 } catch (RuntimeException ex) {
@@ -940,6 +973,26 @@ public class SWFInputStream extends InputStream {
                 }
                 ret.set(ip + i, a);
             }
+            
+            if (a instanceof GraphSourceItemContainer) {
+                GraphSourceItemContainer cnt=(GraphSourceItemContainer)a;
+                long endAddr=((GraphSourceItemContainer)a).getEndAddress();
+                /*if(!containers.containsKey(endAddr)){
+                    containers.put(endAddr, new ArrayList<ActionContainer>());
+                }
+                containers.get(endAddr).add((ActionContainer)a);
+                */
+                List localData2 = Helper.toList(new HashMap<Integer, String>(), new HashMap<String, GraphTargetItem>(), new HashMap<String, GraphTargetItem>());
+                List<GraphTargetItem> output2=new ArrayList<GraphTargetItem>();
+                readActionListAtPos(output2,containers, address, containerSWFOffset, notCompileTime, enableVariables, localData2, new Stack<GraphTargetItem>(), cpool, sis, rri, ip+info, ret, startIp, (int)endAddr);
+                cnt.translateContainer(output2, stack, output,(HashMap<Integer, String>) localData.get(0),(HashMap<String, GraphTargetItem>)localData.get(1),(HashMap<String, GraphTargetItem>)localData.get(2));                
+                
+                ip = (int)endAddr;
+                prevIp = ip;
+                filePos = rri.getPos();
+                continue;
+                //infoCorrect += ((ActionContainer) a).getDataLength();
+            }
 
             if (a instanceof ActionEnd) {
                 break;
@@ -959,7 +1012,7 @@ public class SWFInputStream extends InputStream {
                 aif.jumpUsed = true;
                 int oldPos = rri.getPos();
                 Stack<GraphTargetItem> substack = (Stack<GraphTargetItem>) stack.clone();
-                if (readActionListAtPos(address, containerSWFOffset, true, enableVariables, localData, substack, cpool, sis, rri, rri.getPos() + aif.getJumpOffset(), ret, startIp, endip)) {
+                if (readActionListAtPos(output,containers,address, containerSWFOffset, true, enableVariables, localData, substack, cpool, sis, rri, rri.getPos() + aif.getJumpOffset(), ret, startIp, endip)) {
                     retv = true;
                 }
                 rri.setPos(oldPos);
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/Action.java b/trunk/src/com/jpexs/decompiler/flash/action/Action.java
index d1f90ccf5..f0c4dca6c 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/Action.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/Action.java
@@ -23,7 +23,7 @@ import com.jpexs.decompiler.flash.action.parser.ASMParser;
 import com.jpexs.decompiler.flash.action.parser.FlasmLexer;
 import com.jpexs.decompiler.flash.action.parser.ParseException;
 import com.jpexs.decompiler.flash.action.parser.ParsedSymbol;
-import com.jpexs.decompiler.flash.action.special.ActionContainer;
+import com.jpexs.decompiler.flash.graph.GraphSourceItemContainer;
 import com.jpexs.decompiler.flash.action.swf4.*;
 import com.jpexs.decompiler.flash.action.swf5.*;
 import com.jpexs.decompiler.flash.action.swf6.ActionEnumerate2;
@@ -377,35 +377,62 @@ public class Action implements GraphSourceItem {
      * @param hex Add hexadecimal?
      * @return ASM source as String
      */
-    public static String actionsToString(long address, List<Action> list, List<Long> importantOffsets, List<String> constantPool, int version, boolean hex, long swfPos) {
+    public static String actionsToString(long address, List list, List<Long> importantOffsets, List<String> constantPool, int version, boolean hex, long swfPos) {        
         String ret = "";
         long offset;
         if (importantOffsets == null) {
             //setActionsAddresses(list, 0, version);
             importantOffsets = getActionsAllRefs(list, version);
         }
-        List<ConstantPool> cps = SWFInputStream.getConstantPool(new ActionGraphSource(list, version, new HashMap<Integer, String>(), new HashMap<String, GraphTargetItem>(), new HashMap<String, GraphTargetItem>()), 0, version);
+        List<GraphSourceItem> srcList=new ArrayList<GraphSourceItem>();
+        for(Object o:list){
+            if(o instanceof Action){
+                srcList.add((Action)o);
+            }
+        }
+         List<ConstantPool> cps = SWFInputStream.getConstantPool(new ActionGraphSource(srcList, version, new HashMap<Integer, String>(), new HashMap<String, GraphTargetItem>(), new HashMap<String, GraphTargetItem>()), 0, version);
         if (!cps.isEmpty()) {
             setConstantPool(list, cps.get(cps.size() - 1));
         }
+        HashMap<Long,List<GraphSourceItemContainer>> containers=new HashMap<Long, List<GraphSourceItemContainer>>();
         offset = address;
         int pos = -1;
-        for (Action a : list) {
+        for (GraphSourceItem s : srcList) {
+            Action a=null;
+            if(s instanceof Action){
+                a=(Action)s;
+            }
             pos++;
             if (hex) {
-                ret += "<ffdec:hex>" +/*"0x"+Helper.formatAddress(a.getFileAddress())+": "+*/ Helper.bytesToHexString((a instanceof ActionContainer) ? ((ActionContainer) a).getHeaderBytes() : a.getBytes(version)) + "</ffdec:hex>\r\n";
+                ret += "<ffdec:hex>" +/*"0x"+Helper.formatAddress(a.getFileAddress())+": "+*/ Helper.bytesToHexString((a instanceof GraphSourceItemContainer) ? ((GraphSourceItemContainer) a).getHeaderBytes() : a.getBytes(version)) + "</ffdec:hex>\r\n";
             }
             offset = a.getAddress();
+            
+            if((!(a.ignored)) && (a instanceof GraphSourceItemContainer)){
+                if(!containers.containsKey(((GraphSourceItemContainer)a).getEndAddress())){
+                    containers.put(((GraphSourceItemContainer)a).getEndAddress(), new ArrayList<GraphSourceItemContainer>());
+                }
+                containers.get(((GraphSourceItemContainer)a).getEndAddress()).add((GraphSourceItemContainer)a);
+            }
+            
+            if(containers.containsKey(offset)){
+                for(int i=0;i<containers.get(offset).size();i++){
+                    ret+="}\r\n";
+                }
+            }
+            
             if (importantOffsets.contains(offset)) {
                 ret += "loc" + Helper.formatAddress(offset) + ":";
             }
+            
+            
 
             if (a.replaceWith != null) {
-                ret += Highlighting.hilighOffset("", offset) + a.replaceWith.getASMSource(importantOffsets, constantPool, version, hex) + "\r\n";
+                ret += Highlighting.hilighOffset("", offset) + a.replaceWith.getASMSource(list,importantOffsets, constantPool, version, hex) + "\r\n";
             } else if (a.ignored) {
                 int len = 0;
                 if (pos + 1 < list.size()) {
-                    len = (int) (list.get(pos + 1).getAddress() - a.getAddress());
+                    len = (int) (((Action)(list.get(pos + 1))).getAddress() - a.getAddress());
                 } else {
                     len = a.getBytes(version).length;
                 }
@@ -414,21 +441,23 @@ public class Action implements GraphSourceItem {
                 }
             } else {
                 if (a.beforeInsert != null) {
-                    ret += a.beforeInsert.getASMSource(importantOffsets, constantPool, version, hex) + "\r\n";
+                    ret += a.beforeInsert.getASMSource(list,importantOffsets, constantPool, version, hex) + "\r\n";
                 }
                 //if (!(a instanceof ActionNop)) {
-                /*String add="";
+                String add="";
                  if(a instanceof ActionIf){
                  add = " change: "+((ActionIf)a).getJumpOffset();
                  }
                  if(a instanceof ActionJump){
                  add = " change: "+((ActionJump)a).getJumpOffset();
-                 }*/
-                ret += Highlighting.hilighOffset("", offset) + a.getASMSourceReplaced(importantOffsets, constantPool, version, hex) + (a.ignored ? "; ignored" : "") +/*"; ofs"+Helper.formatAddress(offset)+add +*/ "\r\n";
+                 }
+                 add="; ofs"+Helper.formatAddress(offset)+add;
+                 add="";
+                ret += Highlighting.hilighOffset("", offset) + a.getASMSourceReplaced(list,importantOffsets, constantPool, version, hex) + (a.ignored ? "; ignored" : "") +add + "\r\n";
 
                 //}
                 if (a.afterInsert != null) {
-                    ret += a.afterInsert.getASMSource(importantOffsets, constantPool, version, hex) + "\r\n";
+                    ret += a.afterInsert.getASMSource(list,importantOffsets, constantPool, version, hex) + "\r\n";
                 }
             }
             offset += a.getBytes(version).length;
@@ -448,7 +477,7 @@ public class Action implements GraphSourceItem {
      * @param hex Add hexadecimal
      * @return
      */
-    public String getASMSource(List<Long> knownAddreses, List<String> constantPool, int version, boolean hex) {
+    public String getASMSource(List<GraphSourceItem> container, List<Long> knownAddreses, List<String> constantPool, int version, boolean hex) {
         return toString();
     }
 
@@ -488,6 +517,12 @@ public class Action implements GraphSourceItem {
      * @return address
      */
     public static long ip2adr(List<Action> actions, int ip, int version) {
+      /*  List<Action> actions=new ArrayList<Action>();
+        for(GraphSourceItem s:sources){
+            if(s instanceof Action){
+                actions.add((Action)s);
+            }
+        }*/
         if (ip >= actions.size()) {
             if (actions.isEmpty()) {
                 return 0;
@@ -619,7 +654,13 @@ public class Action implements GraphSourceItem {
         logger.fine(s);
     }
 
-    public static List<GraphTargetItem> actionsPartToTree(HashMap<Integer, String> registerNames, HashMap<String, GraphTargetItem> variables, HashMap<String, GraphTargetItem> functions, Stack<GraphTargetItem> stack, List<Action> actions, int start, int end, int version) {
+    public static List<GraphTargetItem> actionsPartToTree(HashMap<Integer, String> registerNames, HashMap<String, GraphTargetItem> variables, HashMap<String, GraphTargetItem> functions, Stack<GraphTargetItem> stack, List<GraphSourceItem> src, int start, int end, int version) {
+        List<Action> actions=new ArrayList<Action>();
+        for(GraphSourceItem s:src){
+            if(s instanceof Action){
+                actions.add((Action)s);
+            }
+        }
         if (start < actions.size() && (end > 0) && (start > 0)) {
             log("Entering " + start + "-" + end + (actions.size() > 0 ? (" (" + actions.get(start).toString() + " - " + actions.get(end == actions.size() ? end - 1 : end) + ")") : ""));
         }
@@ -679,6 +720,17 @@ public class Action implements GraphSourceItem {
                 ip++;
                 continue;
             }
+            
+            if(action instanceof GraphSourceItemContainer){
+                long endAddr=((GraphSourceItemContainer)action).getEndAddress();
+                int endip=adr2ip(actions, endAddr, version);
+                //List<GraphTargetItem> out=actionsPartToTree(new HashMap<Integer, String>(), new HashMap<String, GraphTargetItem>(),new HashMap<String, GraphTargetItem>(), new Stack<GraphTargetItem>(), src, ip+1,endip-1 , version);            
+                List<GraphTargetItem> out=ActionGraph.translateViaGraph(registerNames, variables, functions, src.subList(ip+1, endip), version);
+                ((GraphSourceItemContainer)action).translateContainer(out, stack, output, registerNames, variables, functions);
+                ip=endip;
+                continue;
+            }
+            
             //System.out.println(" ip "+ip+" "+action);
             //return in for..in
             if ((action instanceof ActionPush) && (((ActionPush) action).values.size() == 1) && (((ActionPush) action).values.get(0) instanceof Null)) {
@@ -721,11 +773,11 @@ public class Action implements GraphSourceItem {
                 catchCommands.add(ActionGraph.translateViaGraph(registerNames, variables, functions, atry.catchBody, version));
                 List<GraphTargetItem> finallyCommands = ActionGraph.translateViaGraph(registerNames, variables, functions, atry.finallyBody, version);
                 output.add(new TryTreeItem(tryCommands, catchExceptions, catchCommands, finallyCommands));
-            } else if (action instanceof ActionWith) {
+            } else /*if (action instanceof ActionWith) {
                 ActionWith awith = (ActionWith) action;
-                List<GraphTargetItem> withCommands = ActionGraph.translateViaGraph(registerNames, variables, functions, awith.actions, version);
+                List<GraphTargetItem> withCommands = ActionGraph.translateViaGraph(registerNames, variables, functions,new ArrayList<Action>() , version); //TODO:parse with actions
                 output.add(new WithTreeItem(action, stack.pop(), withCommands));
-            } else if (action instanceof ActionStoreRegister) {
+            } else */if (action instanceof ActionStoreRegister) {
                 if ((ip + 1 <= end) && (actions.get(ip + 1) instanceof ActionPop)) {
                     action.translate(localData, stack, output);
                     stack.pop();
@@ -1062,6 +1114,9 @@ public class Action implements GraphSourceItem {
 
     public static List<Action> removeNops(long address, List<Action> actions, int version, long swfPos) {
         List<Action> ret = actions;
+        if(true){
+            //return ret;
+        }
         String s = null;
         try {
             s = Highlighting.stripHilights(Action.actionsToString(address, ret, null, version, false, swfPos));
@@ -1072,8 +1127,8 @@ public class Action implements GraphSourceItem {
         return ret;
     }
 
-    public static void setConstantPool(List<Action> actions, ConstantPool cpool) {
-        for (Action a : actions) {
+    public static void setConstantPool(List<GraphSourceItem> actions, ConstantPool cpool) {
+        for (GraphSourceItem a : actions) {
             if (a instanceof ActionPush) {
                 if (cpool != null) {
                     ((ActionPush) a).constantPool = cpool.constants;
@@ -1081,18 +1136,18 @@ public class Action implements GraphSourceItem {
             }
             if (a instanceof ActionDefineFunction) {
                 if (cpool != null) {
-                    ((ActionDefineFunction) a).setConstantPool(cpool.constants);
+                    //((ActionDefineFunction) a).setConstantPool(cpool.constants,actions);
                 }
             }
             if (a instanceof ActionDefineFunction2) {
                 if (cpool != null) {
-                    ((ActionDefineFunction2) a).setConstantPool(cpool.constants);
+                    //((ActionDefineFunction2) a).setConstantPool(cpool.constants,actions);
                 }
             }
         }
     }
 
-    public String getASMSourceReplaced(List<Long> knownAddreses, List<String> constantPool, int version, boolean hex) {
-        return getASMSource(knownAddreses, constantPool, version, hex);
+    public String getASMSourceReplaced(List<GraphSourceItem> container, List<Long> knownAddreses, List<String> constantPool, int version, boolean hex) {
+        return getASMSource(container,knownAddreses, constantPool, version, hex);
     }
 }
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/ActionGraph.java b/trunk/src/com/jpexs/decompiler/flash/action/ActionGraph.java
index b368feb52..0237c86bf 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/ActionGraph.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/ActionGraph.java
@@ -53,7 +53,7 @@ import java.util.Stack;
  */
 public class ActionGraph extends Graph {
 
-    public ActionGraph(List<Action> code, HashMap<Integer, String> registerNames, HashMap<String, GraphTargetItem> variables, HashMap<String, GraphTargetItem> functions, int version) {
+    public ActionGraph(List code, HashMap<Integer, String> registerNames, HashMap<String, GraphTargetItem> variables, HashMap<String, GraphTargetItem> functions, int version) {
         super(new ActionGraphSource(code, version, registerNames, variables, functions), new ArrayList<Integer>());
         //this.version = version;
       /*heads = makeGraph(code, new ArrayList<GraphPart>());
@@ -63,7 +63,8 @@ public class ActionGraph extends Graph {
          }*/
     }
 
-    public static List<GraphTargetItem> translateViaGraph(HashMap<Integer, String> registerNames, HashMap<String, GraphTargetItem> variables, HashMap<String, GraphTargetItem> functions, List<Action> code, int version) {
+    public static List<GraphTargetItem> translateViaGraph(HashMap<Integer, String> registerNames, HashMap<String, GraphTargetItem> variables, HashMap<String, GraphTargetItem> functions, List code, int version) {
+        
         ActionGraph g = new ActionGraph(code, registerNames, variables, functions, version);
         List localData = new ArrayList();
         localData.add(registerNames);
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/ActionGraphSource.java b/trunk/src/com/jpexs/decompiler/flash/action/ActionGraphSource.java
index f272020f3..117ab9b81 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/ActionGraphSource.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/ActionGraphSource.java
@@ -1,8 +1,11 @@
 package com.jpexs.decompiler.flash.action;
 
+import com.jpexs.decompiler.flash.graph.GraphSourceItemContainer;
 import com.jpexs.decompiler.flash.graph.GraphSource;
 import com.jpexs.decompiler.flash.graph.GraphSourceItem;
 import com.jpexs.decompiler.flash.graph.GraphTargetItem;
+import com.jpexs.decompiler.flash.helpers.Helper;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Stack;
@@ -13,13 +16,19 @@ import java.util.Stack;
  */
 public class ActionGraphSource extends GraphSource {
 
-    private List<Action> actions;
+    private List<GraphSourceItem> actions;
     public int version;
     private HashMap<Integer, String> registerNames;
     private HashMap<String, GraphTargetItem> variables;
     private HashMap<String, GraphTargetItem> functions;
 
-    public ActionGraphSource(List<Action> actions, int version, HashMap<Integer, String> registerNames, HashMap<String, GraphTargetItem> variables, HashMap<String, GraphTargetItem> functions) {
+    public List<GraphSourceItem> getActions() {
+        return actions;
+    }
+
+    
+    
+    public ActionGraphSource(List<GraphSourceItem> actions, int version, HashMap<Integer, String> registerNames, HashMap<String, GraphTargetItem> variables, HashMap<String, GraphTargetItem> functions) {
         this.actions = actions;
         this.version = version;
         this.registerNames = registerNames;
@@ -50,13 +59,71 @@ public class ActionGraphSource extends GraphSource {
     public List<GraphTargetItem> translatePart(List localData, Stack<GraphTargetItem> stack, int start, int end) {
         return (Action.actionsPartToTree(registerNames, variables, functions, stack, actions, start, end, version));
     }
+    
+    private List<Long> posCache=null;
 
+    private void rebuildCache(){
+        posCache = new ArrayList<Long>();
+        for(int i=0;i<size();i++){
+            posCache.add(pos2adr(i));
+        }
+    }
+    
+   /* public int adr2posInside(long addr){
+        long lastAddr=0;
+        if(addr==0){
+            return 0;
+        }
+        for(int i=0;i<size();i++){
+            long curAdr=pos2adr(i);
+            if(curAdr==addr){
+                return i;
+            }
+            if(curAdr>addr){                
+                System.err.println("lastAddr="+lastAddr+" addr="+addr+" curAddr="+curAdr);
+                int contPos=adr2pos(lastAddr);
+                System.err.println("/insadr2po");
+                GraphSourceItem src=get(contPos);
+                if(src instanceof ActionContainer){
+                    ActionContainer cnt=(ActionContainer)src;
+                    return new ActionGraphSource(cnt.getActions(), version, registerNames, variables, functions).adr2pos(addr);
+                }else{
+                    return -1;
+                }                
+            }
+            lastAddr=curAdr;
+        }
+        return -1;
+    }*/
     @Override
     public int adr2pos(long adr) {
-        int pos = 0;
+        if(posCache==null){
+            rebuildCache();
+        }
+        if(adr==0){
+            return 0;
+        }
+        int ret=posCache.indexOf((Long)adr);   
+        if(ret==-1){
+            if(!posCache.isEmpty() && (adr>posCache.get(posCache.size()-1))){
+                return size();
+            }
+            //ret = adr2posInside(adr);
+            if(ret==-1){
+                System.err.println("Addr loc"+Helper.formatAddress(adr)+" not found");
+                int pos=0;
+                for(long l:posCache){
+                    System.err.println("ip "+pos+" action "+get(pos).toString()+" loc"+Helper.formatAddress(l));
+                    pos++;
+                }
+            }
+        }
+        return ret;
+        /*int pos = 0;
         long lastAddr = 0;
         for (Action a : actions) {
             lastAddr = a.getAddress();
+            System.err.println("ip "+pos+" addr "+Helper.formatAddress(lastAddr));
             if (lastAddr == adr) {
                 return pos;
             }
@@ -70,11 +137,15 @@ public class ActionGraphSource extends GraphSource {
             return 0;
         }
         //throw new RuntimeException("Address "+Helper.formatAddress(adr)+" not found");
-        return -1;
+        return -1;*/
     }
 
     @Override
     public long pos2adr(int pos) {
-        return actions.get(pos).getAddress();//Action.ip2adr(actions, pos, version);
+        GraphSourceItem si=actions.get(pos);
+        if(si instanceof Action){
+         return ((Action)si) .getAddress();//Action.ip2adr(actions, pos, version);
+        }
+        return 0;
     }
 }
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/parser/ASMParser.java b/trunk/src/com/jpexs/decompiler/flash/action/parser/ASMParser.java
index cd98d7203..6f191e583 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/parser/ASMParser.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/parser/ASMParser.java
@@ -19,6 +19,7 @@ package com.jpexs.decompiler.flash.action.parser;
 import com.jpexs.decompiler.flash.action.Action;
 import com.jpexs.decompiler.flash.action.flashlite.ActionFSCommand2;
 import com.jpexs.decompiler.flash.action.flashlite.ActionStrictMode;
+import com.jpexs.decompiler.flash.graph.GraphSourceItemContainer;
 import com.jpexs.decompiler.flash.action.special.ActionNop;
 import com.jpexs.decompiler.flash.action.swf3.*;
 import com.jpexs.decompiler.flash.action.swf4.*;
@@ -30,6 +31,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Stack;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -37,6 +39,7 @@ 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<Action>();
+        Stack<GraphSourceItemContainer> containers=new Stack<GraphSourceItemContainer>();
         while (true) {
             ParsedSymbol symb = lexer.yylex();
             if (symb.type == ParsedSymbol.TYPE_LABEL) {
@@ -51,231 +54,242 @@ public class ASMParser {
                         }
                     }
                 }
-            } else if (symb.type == ParsedSymbol.TYPE_INSTRUCTION_NAME) {
+            } else if(symb.type == ParsedSymbol.TYPE_BLOCK_END){
+                if(containers.isEmpty()){
+                    throw new ParseException("Block end without start", lexer.yyline());
+                }
+                GraphSourceItemContainer a=containers.pop();
+                a.setEndAddress(address);
+            }else if (symb.type == ParsedSymbol.TYPE_INSTRUCTION_NAME) {
                 String instructionName = ((String) symb.value).toLowerCase();
+                Action a =null;
                 if (instructionName.equals("GetURL".toLowerCase())) {
-                    list.add(new ActionGetURL(lexer));
+                    a=new ActionGetURL(lexer);
                 } else if (instructionName.equals("GoToLabel".toLowerCase())) {
-                    list.add(new ActionGoToLabel(lexer));
+                    a=(new ActionGoToLabel(lexer));
                 } else if (instructionName.equals("GotoFrame".toLowerCase())) {
-                    list.add(new ActionGotoFrame(lexer));
+                    a=(new ActionGotoFrame(lexer));
                 } else if (instructionName.equals("NextFrame".toLowerCase())) {
-                    list.add(new ActionNextFrame());
+                    a=(new ActionNextFrame());
                 } else if (instructionName.equals("Play".toLowerCase())) {
-                    list.add(new ActionPlay());
+                    a=(new ActionPlay());
                 } else if (instructionName.equals("PrevFrame".toLowerCase())) {
-                    list.add(new ActionPrevFrame());
+                    a=(new ActionPrevFrame());
                 } else if (instructionName.equals("SetTarget".toLowerCase())) {
-                    list.add(new ActionSetTarget(lexer));
+                    a=(new ActionSetTarget(lexer));
                 } else if (instructionName.equals("Stop".toLowerCase())) {
-                    list.add(new ActionStop());
+                    a=(new ActionStop());
                 } else if (instructionName.equals("StopSounds".toLowerCase())) {
-                    list.add(new ActionStopSounds());
+                    a=(new ActionStopSounds());
                 } else if (instructionName.equals("ToggleQuality".toLowerCase())) {
-                    list.add(new ActionToggleQuality());
+                    a=(new ActionToggleQuality());
                 } else if (instructionName.equals("WaitForFrame".toLowerCase())) {
-                    list.add(new ActionWaitForFrame(lexer));
+                    a=(new ActionWaitForFrame(lexer));
                 } else if (instructionName.equals("Add".toLowerCase())) {
-                    list.add(new ActionAdd());
+                    a=(new ActionAdd());
                 } else if (instructionName.equals("And".toLowerCase())) {
-                    list.add(new ActionAnd());
+                    a=(new ActionAnd());
                 } else if (instructionName.equals("AsciiToChar".toLowerCase())) {
-                    list.add(new ActionAsciiToChar());
+                    a=(new ActionAsciiToChar());
                 } else if (instructionName.equals("Call".toLowerCase())) {
-                    list.add(new ActionCall());
+                    a=(new ActionCall());
                 } else if (instructionName.equals("CharToAscii".toLowerCase())) {
-                    list.add(new ActionCharToAscii());
+                    a=(new ActionCharToAscii());
                 } else if (instructionName.equals("CloneSprite".toLowerCase())) {
-                    list.add(new ActionCloneSprite());
+                    a=(new ActionCloneSprite());
                 } else if (instructionName.equals("Divide".toLowerCase())) {
-                    list.add(new ActionDivide());
+                    a=(new ActionDivide());
                 } else if (instructionName.equals("EndDrag".toLowerCase())) {
-                    list.add(new ActionEndDrag());
+                    a=(new ActionEndDrag());
                 } else if (instructionName.equals("Equals".toLowerCase())) {
-                    list.add(new ActionEquals());
+                    a=(new ActionEquals());
                 } else if (instructionName.equals("GetProperty".toLowerCase())) {
-                    list.add(new ActionGetProperty());
+                    a=(new ActionGetProperty());
                 } else if (instructionName.equals("GetTime".toLowerCase())) {
-                    list.add(new ActionGetTime());
+                    a=(new ActionGetTime());
                 } else if (instructionName.equals("GetURL2".toLowerCase())) {
-                    list.add(new ActionGetURL2(lexer));
+                    a=(new ActionGetURL2(lexer));
                 } else if (instructionName.equals("GetVariable".toLowerCase())) {
-                    list.add(new ActionGetVariable());
+                    a=(new ActionGetVariable());
                 } else if (instructionName.equals("GotoFrame2".toLowerCase())) {
-                    list.add(new ActionGotoFrame2(lexer));
+                    a=(new ActionGotoFrame2(lexer));
                 } else if (instructionName.equals("If".toLowerCase())) {
-                    list.add(new ActionIf(lexer));
+                    a=(new ActionIf(lexer));
                 } else if (instructionName.equals("Jump".toLowerCase())) {
-                    list.add(new ActionJump(lexer));
+                    a=(new ActionJump(lexer));
                 } else if (instructionName.equals("Less".toLowerCase())) {
-                    list.add(new ActionLess());
+                    a=(new ActionLess());
                 } else if (instructionName.equals("MBAsciiToChar".toLowerCase())) {
-                    list.add(new ActionMBAsciiToChar());
+                    a=(new ActionMBAsciiToChar());
                 } else if (instructionName.equals("MBCharToAscii".toLowerCase())) {
-                    list.add(new ActionMBCharToAscii());
+                    a=(new ActionMBCharToAscii());
                 } else if (instructionName.equals("MBStringExtract".toLowerCase())) {
-                    list.add(new ActionMBStringExtract());
+                    a=(new ActionMBStringExtract());
                 } else if (instructionName.equals("MBStringLength".toLowerCase())) {
-                    list.add(new ActionMBStringLength());
+                    a=(new ActionMBStringLength());
                 } else if (instructionName.equals("Multiply".toLowerCase())) {
-                    list.add(new ActionMultiply());
+                    a=(new ActionMultiply());
                 } else if (instructionName.equals("Not".toLowerCase())) {
-                    list.add(new ActionNot());
+                    a=(new ActionNot());
                 } else if (instructionName.equals("Or".toLowerCase())) {
-                    list.add(new ActionOr());
+                    a=(new ActionOr());
                 } else if (instructionName.equals("Pop".toLowerCase())) {
-                    list.add(new ActionPop());
+                    a=(new ActionPop());
                 } else if (instructionName.equals("Push".toLowerCase())) {
-                    list.add(new ActionPush(lexer, constantPool));
+                    a=(new ActionPush(lexer, constantPool));
                 } else if (instructionName.equals("RandomNumber".toLowerCase())) {
-                    list.add(new ActionRandomNumber());
+                    a=(new ActionRandomNumber());
                 } else if (instructionName.equals("RemoveSprite".toLowerCase())) {
-                    list.add(new ActionRemoveSprite());
+                    a=(new ActionRemoveSprite());
                 } else if (instructionName.equals("SetProperty".toLowerCase())) {
-                    list.add(new ActionSetProperty());
+                    a=(new ActionSetProperty());
                 } else if (instructionName.equals("SetTarget2".toLowerCase())) {
-                    list.add(new ActionSetTarget2());
+                    a=(new ActionSetTarget2());
                 } else if (instructionName.equals("SetVariable".toLowerCase())) {
-                    list.add(new ActionSetVariable());
+                    a=(new ActionSetVariable());
                 } else if (instructionName.equals("StartDrag".toLowerCase())) {
-                    list.add(new ActionStartDrag());
+                    a=(new ActionStartDrag());
                 } else if (instructionName.equals("StringAdd".toLowerCase())) {
-                    list.add(new ActionStringAdd());
+                    a=(new ActionStringAdd());
                 } else if (instructionName.equals("StringEquals".toLowerCase())) {
-                    list.add(new ActionStringEquals());
+                    a=(new ActionStringEquals());
                 } else if (instructionName.equals("StringExtract".toLowerCase())) {
-                    list.add(new ActionStringExtract());
+                    a=(new ActionStringExtract());
                 } else if (instructionName.equals("StringLength".toLowerCase())) {
-                    list.add(new ActionStringLength());
+                    a=(new ActionStringLength());
                 } else if (instructionName.equals("StringLess".toLowerCase())) {
-                    list.add(new ActionStringLess());
+                    a=(new ActionStringLess());
                 } else if (instructionName.equals("Subtract".toLowerCase())) {
-                    list.add(new ActionSubtract());
+                    a=(new ActionSubtract());
                 } else if (instructionName.equals("ToInteger".toLowerCase())) {
-                    list.add(new ActionToInteger());
+                    a=(new ActionToInteger());
                 } else if (instructionName.equals("Trace".toLowerCase())) {
-                    list.add(new ActionTrace());
+                    a=(new ActionTrace());
                 } else if (instructionName.equals("WaitForFrame2".toLowerCase())) {
-                    list.add(new ActionWaitForFrame2(lexer));
+                    a=(new ActionWaitForFrame2(lexer));
                 } else if (instructionName.equals("Add2".toLowerCase())) {
-                    list.add(new ActionAdd2());
+                    a=(new ActionAdd2());
                 } else if (instructionName.equals("BitAnd".toLowerCase())) {
-                    list.add(new ActionBitAnd());
+                    a=(new ActionBitAnd());
                 } else if (instructionName.equals("BitLShift".toLowerCase())) {
-                    list.add(new ActionBitLShift());
+                    a=(new ActionBitLShift());
                 } else if (instructionName.equals("BitOr".toLowerCase())) {
-                    list.add(new ActionBitOr());
+                    a=(new ActionBitOr());
                 } else if (instructionName.equals("BitRShift".toLowerCase())) {
-                    list.add(new ActionBitRShift());
+                    a=(new ActionBitRShift());
                 } else if (instructionName.equals("BitURShift".toLowerCase())) {
-                    list.add(new ActionBitURShift());
+                    a=(new ActionBitURShift());
                 } else if (instructionName.equals("BitXor".toLowerCase())) {
-                    list.add(new ActionBitXor());
+                    a=(new ActionBitXor());
                 } else if (instructionName.equals("CallFunction".toLowerCase())) {
-                    list.add(new ActionCallFunction());
+                    a=(new ActionCallFunction());
                 } else if (instructionName.equals("CallMethod".toLowerCase())) {
-                    list.add(new ActionCallMethod());
+                    a=(new ActionCallMethod());
                 } else if (instructionName.equals("ConstantPool".toLowerCase())) {
                     ActionConstantPool acp = new ActionConstantPool(lexer);
                     constantPool = acp.constantPool;
-                    list.add(acp);
+                    a=(acp);
                 } else if (instructionName.equals("Decrement".toLowerCase())) {
-                    list.add(new ActionDecrement());
+                    a=(new ActionDecrement());
                 } else if (instructionName.equals("DefineFunction".toLowerCase())) {
-                    list.add(new ActionDefineFunction(containerSWFOffset + address, ignoreNops, labels, address, lexer, constantPool, version));
+                    a=(new ActionDefineFunction(containerSWFOffset + address, ignoreNops, labels, address, lexer, constantPool, version));
                 } else if (instructionName.equals("DefineLocal".toLowerCase())) {
-                    list.add(new ActionDefineLocal());
+                    a=(new ActionDefineLocal());
                 } else if (instructionName.equals("DefineLocal2".toLowerCase())) {
-                    list.add(new ActionDefineLocal2());
+                    a=(new ActionDefineLocal2());
                 } else if (instructionName.equals("Delete".toLowerCase())) {
-                    list.add(new ActionDelete());
+                    a=(new ActionDelete());
                 } else if (instructionName.equals("Delete2".toLowerCase())) {
-                    list.add(new ActionDelete2());
+                    a=(new ActionDelete2());
                 } else if (instructionName.equals("Enumerate".toLowerCase())) {
-                    list.add(new ActionEnumerate());
+                    a=(new ActionEnumerate());
                 } else if (instructionName.equals("Equals2".toLowerCase())) {
-                    list.add(new ActionEquals2());
+                    a=(new ActionEquals2());
                 } else if (instructionName.equals("GetMember".toLowerCase())) {
-                    list.add(new ActionGetMember());
+                    a=(new ActionGetMember());
                 } else if (instructionName.equals("Increment".toLowerCase())) {
-                    list.add(new ActionIncrement());
+                    a=(new ActionIncrement());
                 } else if (instructionName.equals("InitArray".toLowerCase())) {
-                    list.add(new ActionInitArray());
+                    a=(new ActionInitArray());
                 } else if (instructionName.equals("InitObject".toLowerCase())) {
-                    list.add(new ActionInitObject());
+                    a=(new ActionInitObject());
                 } else if (instructionName.equals("Less2".toLowerCase())) {
-                    list.add(new ActionLess2());
+                    a=(new ActionLess2());
                 } else if (instructionName.equals("Modulo".toLowerCase())) {
-                    list.add(new ActionModulo());
+                    a=(new ActionModulo());
                 } else if (instructionName.equals("NewMethod".toLowerCase())) {
-                    list.add(new ActionNewMethod());
+                    a=(new ActionNewMethod());
                 } else if (instructionName.equals("NewObject".toLowerCase())) {
-                    list.add(new ActionNewObject());
+                    a=(new ActionNewObject());
                 } else if (instructionName.equals("PushDuplicate".toLowerCase())) {
-                    list.add(new ActionPushDuplicate());
+                    a=(new ActionPushDuplicate());
                 } else if (instructionName.equals("Return".toLowerCase())) {
-                    list.add(new ActionReturn());
+                    a=(new ActionReturn());
                 } else if (instructionName.equals("SetMember".toLowerCase())) {
-                    list.add(new ActionSetMember());
+                    a=(new ActionSetMember());
                 } else if (instructionName.equals("StackSwap".toLowerCase())) {
-                    list.add(new ActionStackSwap());
+                    a=(new ActionStackSwap());
                 } else if (instructionName.equals("StoreRegister".toLowerCase())) {
-                    list.add(new ActionStoreRegister(lexer));
+                    a=(new ActionStoreRegister(lexer));
                 } else if (instructionName.equals("TargetPath".toLowerCase())) {
-                    list.add(new ActionTargetPath());
+                    a=(new ActionTargetPath());
                 } else if (instructionName.equals("ToNumber".toLowerCase())) {
-                    list.add(new ActionToNumber());
+                    a=(new ActionToNumber());
                 } else if (instructionName.equals("ToString".toLowerCase())) {
-                    list.add(new ActionToString());
+                    a=(new ActionToString());
                 } else if (instructionName.equals("TypeOf".toLowerCase())) {
-                    list.add(new ActionTypeOf());
+                    a=(new ActionTypeOf());
                 } else if (instructionName.equals("With".toLowerCase())) {
-                    list.add(new ActionWith(containerSWFOffset + address, ignoreNops, labels, address, lexer, constantPool, version));
+                    a=(new ActionWith(containerSWFOffset + address, ignoreNops, labels, address, lexer, constantPool, version));
                 } else if (instructionName.equals("Enumerate2".toLowerCase())) {
-                    list.add(new ActionEnumerate2());
+                    a=(new ActionEnumerate2());
                 } else if (instructionName.equals("Greater".toLowerCase())) {
-                    list.add(new ActionGreater());
+                    a=(new ActionGreater());
                 } else if (instructionName.equals("InstanceOf".toLowerCase())) {
-                    list.add(new ActionInstanceOf());
+                    a=(new ActionInstanceOf());
                 } else if (instructionName.equals("StrictEquals".toLowerCase())) {
-                    list.add(new ActionStrictEquals());
+                    a=(new ActionStrictEquals());
                 } else if (instructionName.equals("StringGreater".toLowerCase())) {
-                    list.add(new ActionStringGreater());
+                    a=(new ActionStringGreater());
                 } else if (instructionName.equals("CastOp".toLowerCase())) {
-                    list.add(new ActionCastOp());
+                    a=(new ActionCastOp());
                 } else if (instructionName.equals("DefineFunction2".toLowerCase())) {
-                    list.add(new ActionDefineFunction2(containerSWFOffset + address, ignoreNops, labels, address, lexer, constantPool, version));
+                    a=(new ActionDefineFunction2(containerSWFOffset + address, ignoreNops, labels, address, lexer, constantPool, version));
                 } else if (instructionName.equals("Extends".toLowerCase())) {
-                    list.add(new ActionExtends());
+                    a=(new ActionExtends());
                 } else if (instructionName.equals("ImplementsOp".toLowerCase())) {
-                    list.add(new ActionImplementsOp());
+                    a=(new ActionImplementsOp());
                 } else if (instructionName.equals("Throw".toLowerCase())) {
-                    list.add(new ActionThrow());
+                    a=(new ActionThrow());
                 } else if (instructionName.equals("Try".toLowerCase())) {
-                    list.add(new ActionTry(containerSWFOffset + address, ignoreNops, labels, address, lexer, constantPool, version));
+                    a=(new ActionTry(containerSWFOffset + address, ignoreNops, labels, address, lexer, constantPool, version));
                 } else if (instructionName.equals("FSCommand2".toLowerCase())) {
-                    list.add(new ActionFSCommand2());
+                    a=(new ActionFSCommand2());
                 } else if (instructionName.equals("StrictMode".toLowerCase())) {
-                    list.add(new ActionStrictMode(lexer));
+                    a=(new ActionStrictMode(lexer));
                 } else if (instructionName.equals("Nop".toLowerCase())) {
                     if (!ignoreNops) {
-                        list.add(new ActionNop());
+                        a=(new ActionNop());
                     }
                 }/* else if(instructionName.startsWith("ofs")) {
                  continue;
                  }*/ else {
                     throw new ParseException("Unknown instruction name :" + instructionName, lexer.yyline());
                 }
-                if (instructionName.equals("Nop".toLowerCase())) {
-                    if (!ignoreNops) {
-                        (list.get(list.size() - 1)).containerSWFOffset = containerSWFOffset;
-                        (list.get(list.size() - 1)).setAddress(address, version, false);
-                        address += 1;
-                    }
-                } else {
-                    (list.get(list.size() - 1)).containerSWFOffset = containerSWFOffset;
-                    (list.get(list.size() - 1)).setAddress(address, version, false);
-                    address += (list.get(list.size() - 1)).getBytes(version).length;
+                if (a instanceof ActionNop) {            
+                        a.containerSWFOffset = containerSWFOffset;
+                        a.setAddress(address, version, false);
+                        address += 1;                    
+                } else if(a!=null) {
+                    a.containerSWFOffset = containerSWFOffset;
+                    a.setAddress(address, version, false);
+                    address += a.getBytes(version).length;
+                }
+                if(a instanceof GraphSourceItemContainer){
+                    containers.push((GraphSourceItemContainer)a);
+                }
+                if(a!=null){
+                    list.add(a);
                 }
             } else if (symb.type == ParsedSymbol.TYPE_EOL) {
             } else if ((symb.type == ParsedSymbol.TYPE_BLOCK_END) || (symb.type == ParsedSymbol.TYPE_EOF)) {
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/special/ActionContainer.java b/trunk/src/com/jpexs/decompiler/flash/action/special/ActionContainer.java
deleted file mode 100644
index 239f38c25..000000000
--- a/trunk/src/com/jpexs/decompiler/flash/action/special/ActionContainer.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.jpexs.decompiler.flash.action.special;
-
-import com.jpexs.decompiler.flash.action.Action;
-import java.util.List;
-
-/**
- *
- * @author JPEXS
- */
-public interface ActionContainer {
-
-    public byte[] getHeaderBytes();
-
-    public List<Action> getActions();
-
-    public int getDataLength();
-}
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionIf.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionIf.java
index 6f5848c51..a412e0060 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionIf.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionIf.java
@@ -23,6 +23,7 @@ import com.jpexs.decompiler.flash.action.ActionGraphSource;
 import com.jpexs.decompiler.flash.action.parser.FlasmLexer;
 import com.jpexs.decompiler.flash.action.parser.ParseException;
 import com.jpexs.decompiler.flash.graph.GraphSource;
+import com.jpexs.decompiler.flash.graph.GraphSourceItem;
 import com.jpexs.decompiler.flash.helpers.Helper;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -76,7 +77,7 @@ public class ActionIf extends Action {
     }
 
     @Override
-    public String getASMSource(List<Long> knownAddreses, List<String> constantPool, int version, boolean hex) {
+    public String getASMSource(List<GraphSourceItem> container, List<Long> knownAddreses, List<String> constantPool, int version, boolean hex) {
         String ofsStr = Helper.formatAddress(getAddress() + getBytes(version).length + offset);
         return "If loc" + ofsStr + (compileTime ? " ;compileTime" : "");
     }
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionJump.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionJump.java
index d5b405e39..dfcb1b69f 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionJump.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionJump.java
@@ -23,6 +23,7 @@ import com.jpexs.decompiler.flash.action.ActionGraphSource;
 import com.jpexs.decompiler.flash.action.parser.FlasmLexer;
 import com.jpexs.decompiler.flash.action.parser.ParseException;
 import com.jpexs.decompiler.flash.graph.GraphSource;
+import com.jpexs.decompiler.flash.graph.GraphSourceItem;
 import com.jpexs.decompiler.flash.helpers.Helper;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -40,13 +41,13 @@ public class ActionJump extends Action {
         return offset;
     }
 
-    public void setJumpOffset(int offset) {
+    public final void setJumpOffset(int offset) {
         this.offset = offset;
     }
 
     public ActionJump(int offset) {
         super(0x99, 2);
-        this.offset = offset;
+        setJumpOffset(offset);
     }
 
     public ActionJump(SWFInputStream sis) throws IOException {
@@ -78,7 +79,7 @@ public class ActionJump extends Action {
     }
 
     @Override
-    public String getASMSource(List<Long> knownAddreses, List<String> constantPool, int version, boolean hex) {
+    public String getASMSource(List<GraphSourceItem> container, List<Long> knownAddreses, List<String> constantPool, int version, boolean hex) {
         String ofsStr = Helper.formatAddress(getAddress() + getBytes(version).length + offset);
         return "Jump loc" + ofsStr;
     }
@@ -111,6 +112,7 @@ public class ActionJump extends Action {
         int ofs = code.adr2pos(getAddress() + getBytes(((ActionGraphSource) code).version).length + offset);
         if (ofs == -1) {
             ofs = code.adr2pos(getAddress() + getBytes(((ActionGraphSource) code).version).length);
+            new Exception().printStackTrace();
             Logger.getLogger(ActionJump.class.getName()).log(Level.SEVERE, "Invalid jump to ofs" + Helper.formatAddress(getAddress() + getBytes(((ActionGraphSource) code).version).length + offset) + " from ofs" + Helper.formatAddress(getAddress()));
         }
         ret.add(ofs);
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 9bcf8057b..c4eb7444f 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java
@@ -23,6 +23,7 @@ import com.jpexs.decompiler.flash.action.parser.FlasmLexer;
 import com.jpexs.decompiler.flash.action.parser.ParseException;
 import com.jpexs.decompiler.flash.action.parser.ParsedSymbol;
 import com.jpexs.decompiler.flash.action.treemodel.DirectValueTreeItem;
+import com.jpexs.decompiler.flash.graph.GraphSourceItem;
 import com.jpexs.decompiler.flash.graph.GraphTargetItem;
 import com.jpexs.decompiler.flash.helpers.Helper;
 import java.io.ByteArrayInputStream;
@@ -186,7 +187,7 @@ public class ActionPush extends Action {
     }
 
     @Override
-    public String getASMSourceReplaced(List<Long> knownAddreses, List<String> constantPool, int version, boolean hex) {
+    public String getASMSourceReplaced(List<GraphSourceItem> container, List<Long> knownAddreses, List<String> constantPool, int version, boolean hex) {
         if (replacement == null || replacement.size() < values.size()) {
             return toString();
         }
@@ -228,6 +229,7 @@ public class ActionPush extends Action {
         int pos = 0;
         for (Object o : values) {
             if (ignoredParts.contains(pos)) {
+                pos++;
                 continue;
             }
             if (o instanceof ConstantIndex) {
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 086e764b4..55c78bda1 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineFunction.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineFunction.java
@@ -21,14 +21,16 @@ 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.ActionGraphSource;
 import com.jpexs.decompiler.flash.action.parser.ASMParser;
 import com.jpexs.decompiler.flash.action.parser.FlasmLexer;
 import com.jpexs.decompiler.flash.action.parser.Label;
 import com.jpexs.decompiler.flash.action.parser.ParseException;
-import com.jpexs.decompiler.flash.action.special.ActionContainer;
+import com.jpexs.decompiler.flash.graph.GraphSourceItemContainer;
 import com.jpexs.decompiler.flash.action.swf4.ActionPush;
 import com.jpexs.decompiler.flash.action.swf7.ActionDefineFunction2;
 import com.jpexs.decompiler.flash.action.treemodel.FunctionTreeItem;
+import com.jpexs.decompiler.flash.graph.GraphSourceItem;
 import com.jpexs.decompiler.flash.graph.GraphTargetItem;
 import com.jpexs.decompiler.flash.helpers.Helper;
 import java.io.ByteArrayOutputStream;
@@ -38,38 +40,41 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Stack;
 
-public class ActionDefineFunction extends Action implements ActionContainer {
+public class ActionDefineFunction extends Action implements GraphSourceItemContainer {
 
     public String functionName;
     public String replacedFunctionName;
     public List<String> paramNames = new ArrayList<String>();
     public List<String> replacedParamNames;
-    public List<Action> code;
+    //public List<Action> code;
     public int codeSize;
     private int version;
     public List<String> constantPool;
     private long hdrSize;
 
     @Override
-    public List<Action> getActions() {
-        return code;
+    public long getEndAddress() {
+        return getAddress()+getHeaderLength()+codeSize;
     }
 
-    public void setConstantPool(List<String> constantPool) {
-        this.constantPool = constantPool;
-        for (Action a : code) {
-            if (a instanceof ActionPush) {
-                ((ActionPush) a).constantPool = constantPool;
-            }
-            if (a instanceof ActionDefineFunction2) {
-                ((ActionDefineFunction2) a).setConstantPool(constantPool);
-            }
-            if (a instanceof ActionDefineFunction) {
-                ((ActionDefineFunction) a).setConstantPool(constantPool);
-            }
-        }
+    @Override
+    public void setEndAddress(long address) {
+        codeSize = (int)(address-getAddress()-getHeaderLength());
     }
 
+    
+    
+    
+    @Override
+    public List<GraphSourceItem> getItems(List<GraphSourceItem> parent) {
+        if(parent.isEmpty()){
+            return parent;
+        }
+        ActionGraphSource src=new ActionGraphSource(parent, version, new HashMap<Integer, String>(), new HashMap<String, GraphTargetItem>(), new HashMap<String, GraphTargetItem>());
+        return parent.subList(src.adr2pos(getAddress()+getHeaderLength()),src.adr2pos(getAddress()+getHeaderLength()+codeSize));
+    }
+
+
     public ActionDefineFunction(int actionLength, SWFInputStream sis, ReReadableInputStream rri, int version) throws IOException {
         super(0x9B, actionLength);
         this.version = version;
@@ -86,8 +91,8 @@ public class ActionDefineFunction extends Action implements ActionContainer {
         //code = new ArrayList<Action>();
         hdrSize = endPos - startPos;
         int posBef2 = rri.getPos();
-        code = sis.readActionList(rri.getPos(), getFileAddress() + hdrSize, rri, codeSize);
-        rri.setPos(posBef2 + codeSize);
+        //code = sis.readActionList(rri.getPos(), getFileAddress() + hdrSize, rri, codeSize);
+        //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 {
@@ -98,7 +103,7 @@ public class ActionDefineFunction extends Action implements ActionContainer {
             paramNames.add(lexString(lexer));
         }
         lexBlockOpen(lexer);
-        code = ASMParser.parse(containerSWFPos + getHeaderLength(), ignoreNops, labels, address + getPreLen(version), lexer, constantPool, version);
+        //code = ASMParser.parse(containerSWFPos + getHeaderLength(), ignoreNops, labels, address + getPreLen(version), lexer, constantPool, version);
     }
 
     public long getHeaderLength() {
@@ -132,8 +137,8 @@ public class ActionDefineFunction extends Action implements ActionContainer {
             for (String s : paramNames) {
                 sos.writeString(s);
             }
-            byte codeBytes[] = Action.actionsToBytes(code, false, version);
-            sos.writeUI16(codeBytes.length);
+            //byte codeBytes[] = Action.actionsToBytes(getActions(null), false, version);
+            sos.writeUI16(codeSize);//codeBytes.length);
             sos.close();
 
 
@@ -154,13 +159,13 @@ public class ActionDefineFunction extends Action implements ActionContainer {
             for (String s : paramNames) {
                 sos.writeString(s);
             }
-            byte codeBytes[] = Action.actionsToBytes(code, false, version);
-            sos.writeUI16(codeBytes.length);
+            //byte codeBytes[] = Action.actionsToBytes(code, false, version);
+            sos.writeUI16(codeSize); //codeBytes.length);
             sos.close();
 
 
             baos2.write(surroundWithAction(baos.toByteArray(), version));
-            baos2.write(codeBytes);
+            //baos2.write(codeBytes);
         } catch (IOException e) {
         }
         return baos2.toByteArray();
@@ -187,22 +192,23 @@ public class ActionDefineFunction extends Action implements ActionContainer {
     public void setAddress(long address, int version, boolean recursive) {
         super.setAddress(address, version, recursive);
         if (recursive) {
-            Action.setActionsAddresses(code, address + getPreLen(version), version);
+            //Action.setActionsAddresses(, address + getPreLen(version), version);
         }
     }
 
     @Override
-    public String getASMSource(List<Long> knownAddreses, List<String> constantPool, int version, boolean hex) {
+    public String getASMSource(List<GraphSourceItem> container, List<Long> knownAddreses, List<String> constantPool, int version, boolean hex) {
         String paramStr = "";
         for (int i = 0; i < paramNames.size(); i++) {
             paramStr += "\"" + Helper.escapeString(paramNames.get(i)) + "\"";
             paramStr += " ";
         }
-        return "DefineFunction \"" + Helper.escapeString(functionName) + "\" " + paramNames.size() + " " + paramStr + " {\r\n" + Action.actionsToString(getAddress() + getHeaderLength(), code, knownAddreses, constantPool, version, hex, getFileAddress() + hdrSize) + "}";
+        
+        return "DefineFunction \"" + Helper.escapeString(functionName) + "\" " + paramNames.size() + " " + paramStr + " {";// + "\r\n" +Action.actionsToString(getAddress() + getHeaderLength(),getItems(container) , knownAddreses, constantPool, version, hex, getFileAddress() + hdrSize) + "}";
     }
 
     @Override
-    public String getASMSourceReplaced(List<Long> knownAddreses, List<String> constantPool, int version, boolean hex) {
+    public String getASMSourceReplaced(List<GraphSourceItem> container, List<Long> knownAddreses, List<String> constantPool, int version, boolean hex) {
         List<String> oldParamNames = paramNames;
         if (replacedParamNames != null) {
             paramNames = replacedParamNames;
@@ -211,7 +217,7 @@ public class ActionDefineFunction extends Action implements ActionContainer {
         if (replacedFunctionName != null) {
             functionName = replacedFunctionName;
         }
-        String ret = getASMSource(knownAddreses, constantPool, version, hex);
+        String ret = getASMSource(container,knownAddreses, constantPool, version, hex);
         paramNames = oldParamNames;
         functionName = oldFunctionName;
         return ret;
@@ -220,21 +226,28 @@ public class ActionDefineFunction extends Action implements ActionContainer {
 
     @Override
     public List<Long> getAllRefs(int version) {
-        return Action.getActionsAllRefs(code, version);
+        return super.getAllRefs(version);//Action.getActionsAllRefs(getActions(null), version);
     }
 
     @Override
     public List<Action> getAllIfsOrJumps() {
-        return Action.getActionsAllIfsOrJumps(code);
+        return super.getAllIfsOrJumps(); //Action.getActionsAllIfsOrJumps(code);
     }
 
     @Override
     public void translate(Stack<GraphTargetItem> stack, List<GraphTargetItem> output, HashMap<Integer, String> regNames, HashMap<String, GraphTargetItem> variables, HashMap<String, GraphTargetItem> functions) {
-        FunctionTreeItem fti = new FunctionTreeItem(this, functionName, paramNames, ActionGraph.translateViaGraph(regNames, variables, functions, code, version), constantPool, 1);
+        
+    }
+
+    @Override
+    public void translateContainer(List<GraphTargetItem> content, Stack<GraphTargetItem> stack, List<GraphTargetItem> output, HashMap<Integer, String> regNames, HashMap<String, GraphTargetItem> variables, HashMap<String, GraphTargetItem> functions) {
+       FunctionTreeItem fti = new FunctionTreeItem(this, functionName, paramNames, content, constantPool, 1);
+        //ActionGraph.translateViaGraph(regNames, variables, functions, code, version)
         stack.push(fti);
         functions.put(functionName, fti);
     }
-
+    
+    
     @Override
     public String toString() {
         return "DefineFunction";
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 924a62ec9..fe7128669 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionWith.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionWith.java
@@ -20,46 +20,70 @@ import com.jpexs.decompiler.flash.ReReadableInputStream;
 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.ActionGraphSource;
 import com.jpexs.decompiler.flash.action.parser.ASMParser;
 import com.jpexs.decompiler.flash.action.parser.FlasmLexer;
 import com.jpexs.decompiler.flash.action.parser.Label;
 import com.jpexs.decompiler.flash.action.parser.ParseException;
-import com.jpexs.decompiler.flash.action.special.ActionContainer;
+import com.jpexs.decompiler.flash.graph.GraphSourceItemContainer;
+import com.jpexs.decompiler.flash.action.treemodel.clauses.WithTreeItem;
+import com.jpexs.decompiler.flash.graph.GraphSourceItem;
+import com.jpexs.decompiler.flash.graph.GraphTargetItem;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Stack;
 
-public class ActionWith extends Action implements ActionContainer {
+public class ActionWith extends Action implements GraphSourceItemContainer {
 
-    public List<Action> actions;
-    public int size;
+    //public List<Action> actions;
+    public int codeSize;
     public int version;
+    
+    @Override
+    public long getEndAddress() {
+        return getAddress()+2+codeSize;
+    }
 
     @Override
-    public List<Action> getActions() {
-        return actions;
+    public void setEndAddress(long address) {
+        codeSize = (int)(address-getAddress()-2);
+    }
+    
+    
+
+   
+    @Override
+    public List<GraphSourceItem> getItems(List<GraphSourceItem> parent) {
+        if(parent.isEmpty()){
+            return parent;
+        }
+        ActionGraphSource src=new ActionGraphSource(parent, version, new HashMap<Integer, String>(), new HashMap<String, GraphTargetItem>(), new HashMap<String, GraphTargetItem>());
+        return parent.subList(src.adr2pos(getAddress()+2),src.adr2pos(getAddress()+2+codeSize));
     }
 
     public ActionWith(SWFInputStream sis, ReReadableInputStream rri, int version) throws IOException {
         super(0x94, 2);
-        size = sis.readUI16();
+        codeSize = sis.readUI16();
         this.version = version;
         //actions = new ArrayList<Action>();
-        actions = (new SWFInputStream(new ByteArrayInputStream(sis.readBytes(size)), version)).readActionList(rri.getPos(), containerSWFOffset + getAddress() + 2, rri, size);
+        //actions = (new SWFInputStream(new ByteArrayInputStream(sis.readBytes(codeSize)), version)).readActionList(rri.getPos(), containerSWFOffset + getAddress() + 2, rri, codeSize);
+        
     }
 
     public ActionWith(long containerSWFPos, boolean ignoreNops, List<Label> labels, long address, FlasmLexer lexer, List<String> constantPool, int version) throws IOException, ParseException {
         super(0x94, 2);
         lexBlockOpen(lexer);
-        actions = ASMParser.parse(containerSWFPos + 2, ignoreNops, labels, address + 5, lexer, constantPool, version);
+        //actions = ASMParser.parse(containerSWFPos + 2, ignoreNops, labels, address + 5, lexer, constantPool, version);
     }
 
     @Override
     public void setAddress(long address, int version, boolean recursive) {
         super.setAddress(address, version, recursive);
         if (recursive) {
-            Action.setActionsAddresses(actions, address + 5, version);
+            //Action.setActionsAddresses(actions, address + 5, version);
         }
     }
 
@@ -69,8 +93,8 @@ public class ActionWith extends Action implements ActionContainer {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         SWFOutputStream sos = new SWFOutputStream(baos, version);
         try {
-            byte codeBytes[] = Action.actionsToBytes(actions, false, version);
-            sos.writeUI16(codeBytes.length);
+            //byte codeBytes[] = Action.actionsToBytes(actions, false, version);
+            sos.writeUI16(codeSize);//codeBytes.length);
             sos.close();
             baos2.write(surroundWithAction(baos.toByteArray(), version));
         } catch (IOException e) {
@@ -84,33 +108,39 @@ public class ActionWith extends Action implements ActionContainer {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         SWFOutputStream sos = new SWFOutputStream(baos, version);
         try {
-            byte codeBytes[] = Action.actionsToBytes(actions, false, version);
-            sos.writeUI16(codeBytes.length);
+            //byte codeBytes[] = Action.actionsToBytes(actions, false, version);
+            sos.writeUI16(codeSize);//codeBytes.length);
             sos.close();
             baos2.write(surroundWithAction(baos.toByteArray(), version));
-            baos2.write(codeBytes);
+            //baos2.write(codeBytes);
         } catch (IOException e) {
         }
         return baos2.toByteArray();
     }
 
     @Override
-    public String getASMSource(List<Long> knownAddreses, List<String> constantPool, int version, boolean hex) {
-        return "With {\r\n" + Action.actionsToString(getAddress() + 2, actions, knownAddreses, constantPool, version, hex, containerSWFOffset + getAddress() + 2) + "}";
+    public String getASMSource(List<GraphSourceItem> container, List<Long> knownAddreses, List<String> constantPool, int version, boolean hex) {
+        return "With {"; // + "\r\n" + Action.actionsToString(getAddress() + 2, getItems(container), knownAddreses, constantPool, version, hex, containerSWFOffset + getAddress() + 2) + "}";
     }
 
     @Override
     public List<Long> getAllRefs(int version) {
-        return Action.getActionsAllRefs(actions, version);
+        return super.getAllRefs(version);//Action.getActionsAllRefs(actions, version);
     }
 
     @Override
     public List<Action> getAllIfsOrJumps() {
-        return Action.getActionsAllIfsOrJumps(actions);
+        return super.getAllIfsOrJumps();// Action.getActionsAllIfsOrJumps(actions);
     }
 
     @Override
     public int getDataLength() {
-        return size;
+        return codeSize;
     }
+
+    @Override
+    public void translateContainer(List<GraphTargetItem> content, Stack<GraphTargetItem> stack, List<GraphTargetItem> output, HashMap<Integer, String> regNames, HashMap<String, GraphTargetItem> variables, HashMap<String, GraphTargetItem> functions) {
+        output.add(new WithTreeItem(this, stack.pop(), content));
+    }
+    
 }
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 31a9b8e44..91cfa7f36 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionDefineFunction2.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionDefineFunction2.java
@@ -21,14 +21,16 @@ 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.ActionGraphSource;
 import com.jpexs.decompiler.flash.action.parser.ASMParser;
 import com.jpexs.decompiler.flash.action.parser.FlasmLexer;
 import com.jpexs.decompiler.flash.action.parser.Label;
 import com.jpexs.decompiler.flash.action.parser.ParseException;
-import com.jpexs.decompiler.flash.action.special.ActionContainer;
+import com.jpexs.decompiler.flash.graph.GraphSourceItemContainer;
 import com.jpexs.decompiler.flash.action.swf4.ActionPush;
 import com.jpexs.decompiler.flash.action.swf5.ActionDefineFunction;
 import com.jpexs.decompiler.flash.action.treemodel.FunctionTreeItem;
+import com.jpexs.decompiler.flash.graph.GraphSourceItem;
 import com.jpexs.decompiler.flash.graph.GraphTargetItem;
 import com.jpexs.decompiler.flash.helpers.Helper;
 import java.io.ByteArrayOutputStream;
@@ -38,7 +40,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Stack;
 
-public class ActionDefineFunction2 extends Action implements ActionContainer {
+public class ActionDefineFunction2 extends Action implements GraphSourceItemContainer {
 
     public String functionName;
     public String replacedFunctionName;
@@ -56,29 +58,32 @@ public class ActionDefineFunction2 extends Action implements ActionContainer {
     public boolean preloadGlobalFlag;
     public int registerCount;
     public int codeSize;
-    public List<Action> code;
+    //public List<Action> code;
     private int version;
     public List<String> constantPool;
 
     @Override
-    public List<Action> getActions() {
-        return code;
+    public long getEndAddress() {
+        return getAddress()+getHeaderLength()+codeSize;
     }
 
-    public void setConstantPool(List<String> constantPool) {
-        this.constantPool = constantPool;
-        for (Action a : code) {
-            if (a instanceof ActionPush) {
-                ((ActionPush) a).constantPool = constantPool;
-            }
-            if (a instanceof ActionDefineFunction2) {
-                ((ActionDefineFunction2) a).setConstantPool(constantPool);
-            }
-            if (a instanceof ActionDefineFunction) {
-                ((ActionDefineFunction) a).setConstantPool(constantPool);
-            }
-        }
+    @Override
+    public void setEndAddress(long address) {
+        codeSize = (int)(address-getAddress()-getHeaderLength());
     }
+    
+    
+    
+    @Override
+    public List<GraphSourceItem> getItems(List<GraphSourceItem> parent) {
+        if(parent.isEmpty()){
+            return parent;
+        }
+        ActionGraphSource src=new ActionGraphSource(parent, version, new HashMap<Integer, String>(), new HashMap<String, GraphTargetItem>(), new HashMap<String, GraphTargetItem>());
+        return parent.subList(src.adr2pos(getAddress()+hdrSize),src.adr2pos(getAddress()+hdrSize+codeSize));
+    }
+
+    
     private long hdrSize;
 
     public ActionDefineFunction2(int actionLength, SWFInputStream sis, ReReadableInputStream rri, int version) throws IOException {
@@ -107,8 +112,8 @@ public class ActionDefineFunction2 extends Action implements ActionContainer {
         hdrSize = posAfter - posBef;
         //code = new ArrayList<Action>();
         int posBef2 = rri.getPos();
-        code = sis.readActionList(rri.getPos(), getFileAddress() + hdrSize, rri, codeSize);
-        rri.setPos(posBef2 + codeSize);
+        //code = sis.readActionList(rri.getPos(), getFileAddress() + hdrSize, rri, codeSize);
+        //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 {
@@ -130,7 +135,7 @@ public class ActionDefineFunction2 extends Action implements ActionContainer {
             paramNames.add(lexString(lexer));
         }
         lexBlockOpen(lexer);
-        code = ASMParser.parse(containerSWFPos + getHeaderLength(), ignoreNops, labels, address + getPreLen(version), lexer, constantPool, version);
+        //code = ASMParser.parse(containerSWFPos + getHeaderLength(), ignoreNops, labels, address + getPreLen(version), lexer, constantPool, version);
     }
 
     public long getHeaderLength() {
@@ -188,8 +193,8 @@ public class ActionDefineFunction2 extends Action implements ActionContainer {
 
                 sos.writeString(paramNames.get(i));
             }
-            byte codeBytes[] = Action.actionsToBytes(code, false, version);
-            sos.writeUI16(codeBytes.length);
+            //byte codeBytes[] = Action.actionsToBytes(code, false, version);
+            sos.writeUI16(codeSize);//codeBytes.length);
             sos.close();
 
 
@@ -222,13 +227,13 @@ public class ActionDefineFunction2 extends Action implements ActionContainer {
                 sos.writeUI8(paramRegisters.get(i));
                 sos.writeString(paramNames.get(i));
             }
-            byte codeBytes[] = Action.actionsToBytes(code, false, version);
-            sos.writeUI16(codeBytes.length);
+            //byte codeBytes[] = Action.actionsToBytes(code, false, version);
+            sos.writeUI16(codeSize);//codeBytes.length);
             sos.close();
 
 
             baos2.write(surroundWithAction(baos.toByteArray(), version));
-            baos2.write(codeBytes);
+            //baos2.write(codeBytes);
         } catch (IOException e) {
         }
         return baos2.toByteArray();
@@ -267,12 +272,12 @@ public class ActionDefineFunction2 extends Action implements ActionContainer {
     public void setAddress(long address, int version, boolean recursive) {
         super.setAddress(address, version, recursive);
         if (recursive) {
-            Action.setActionsAddresses(code, address + getPreLen(version), version);
+            //Action.setActionsAddresses(code, address + getPreLen(version), version);
         }
     }
 
     @Override
-    public String getASMSourceReplaced(List<Long> knownAddreses, List<String> constantPool, int version, boolean hex) {
+    public String getASMSourceReplaced(List<GraphSourceItem> container, List<Long> knownAddreses, List<String> constantPool, int version, boolean hex) {
         List<String> oldParamNames = paramNames;
         if (replacedParamNames != null) {
             paramNames = replacedParamNames;
@@ -281,7 +286,7 @@ public class ActionDefineFunction2 extends Action implements ActionContainer {
         if (replacedFunctionName != null) {
             functionName = replacedFunctionName;
         }
-        String ret = getASMSource(knownAddreses, constantPool, version, hex);
+        String ret = getASMSource(container,knownAddreses, constantPool, version, hex);
         paramNames = oldParamNames;
         functionName = oldFunctionName;
         return ret;
@@ -289,7 +294,7 @@ public class ActionDefineFunction2 extends Action implements ActionContainer {
     }
 
     @Override
-    public String getASMSource(List<Long> knownAddreses, List<String> constantPool, int version, boolean hex) {
+    public String getASMSource(List<GraphSourceItem> container, List<Long> knownAddreses, List<String> constantPool, int version, boolean hex) {
         String paramStr = "";
         for (int i = 0; i < paramNames.size(); i++) {
             paramStr += paramRegisters.get(i) + " \"" + Helper.escapeString(paramNames.get(i)) + "\"";
@@ -305,7 +310,7 @@ public class ActionDefineFunction2 extends Action implements ActionContainer {
                 + " " + preloadArgumentsFlag
                 + " " + suppressThisFlag
                 + " " + preloadThisFlag
-                + " " + preloadGlobalFlag).trim() + " " + paramStr + " {\r\n" + Action.actionsToString(getAddress() + getHeaderLength(), code, knownAddreses, constantPool, version, hex, getFileAddress() + hdrSize) + "}";
+                + " " + preloadGlobalFlag).trim() + " " + paramStr + " {";// + "\r\n" + Action.actionsToString(getAddress() + getHeaderLength(), getItems(container), knownAddreses, constantPool, version, hex, getFileAddress() + hdrSize) + "}";
     }
 
     @Override
@@ -339,6 +344,11 @@ public class ActionDefineFunction2 extends Action implements ActionContainer {
     @Override
     public void translate(Stack<GraphTargetItem> stack, List<GraphTargetItem> output, HashMap<Integer, String> regNames, HashMap<String, GraphTargetItem> variables, HashMap<String, GraphTargetItem> functions) {
 
+        
+    }
+
+    @Override
+    public void translateContainer(List<GraphTargetItem> content, Stack<GraphTargetItem> stack, List<GraphTargetItem> output, HashMap<Integer, String> regNames, HashMap<String, GraphTargetItem> variables, HashMap<String, GraphTargetItem> functions) {
         HashMap<Integer, String> funcRegNames = (HashMap<Integer, String>) regNames.clone();
         for (int f = 0; f < paramNames.size(); f++) {
             int reg = paramRegisters.get(f);
@@ -372,19 +382,21 @@ public class ActionDefineFunction2 extends Action implements ActionContainer {
             pos++;
         }
 
-        FunctionTreeItem fti = new FunctionTreeItem(this, functionName, paramNames, ActionGraph.translateViaGraph(funcRegNames, variables, functions, code, version), constantPool, getFirstRegister());
+        FunctionTreeItem fti = new FunctionTreeItem(this, functionName, paramNames,content, constantPool, getFirstRegister());
         functions.put(functionName, fti);
         stack.push(fti);
     }
+    
+    
 
     @Override
     public List<Long> getAllRefs(int version) {
-        return Action.getActionsAllRefs(code, version);
+        return super.getAllRefs(version);//return Action.getActionsAllRefs(code, version);
     }
 
     @Override
     public List<Action> getAllIfsOrJumps() {
-        return Action.getActionsAllIfsOrJumps(code);
+        return super.getAllIfsOrJumps(); //return Action.getActionsAllIfsOrJumps(code);
     }
 
     @Override
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 4185f0106..bf4cb8126 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionTry.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionTry.java
@@ -22,6 +22,7 @@ import com.jpexs.decompiler.flash.SWFOutputStream;
 import com.jpexs.decompiler.flash.action.Action;
 import com.jpexs.decompiler.flash.action.parser.*;
 import com.jpexs.decompiler.flash.action.swf4.RegisterNumber;
+import com.jpexs.decompiler.flash.graph.GraphSourceItem;
 import com.jpexs.decompiler.flash.helpers.Helper;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -169,7 +170,7 @@ public class ActionTry extends Action {
     }
 
     @Override
-    public String getASMSource(List<Long> knownAddreses, List<String> constantPool, int version, boolean hex) {
+    public String getASMSource(List<GraphSourceItem> container, List<Long> knownAddreses, List<String> constantPool, int version, boolean hex) {
         String ret = "";
         ret += "Try {";
         ret += Action.actionsToString(getAddress() + tryPos, tryBody, knownAddreses, constantPool, version, hex, getFileAddress() + tryPos);
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/DirectValueTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/DirectValueTreeItem.java
index f30d516e8..1a99a2ac0 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/DirectValueTreeItem.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/DirectValueTreeItem.java
@@ -61,6 +61,33 @@ public class DirectValueTreeItem extends TreeItem {
         if (value instanceof Boolean) {
             return ((Boolean) value) ? 1 : 0;
         }
+        
+        if (value instanceof String) {
+            String s=(String) value;
+            if(s.length()==1){
+                return s.charAt(0);
+            }
+            double ret=0.0;
+            try{
+                ret=Double.parseDouble(s);
+            }catch(NumberFormatException nex){
+                
+            }
+            return ret;
+        }
+        if (value instanceof ConstantIndex) {
+            String s=(this.constants.get(((ConstantIndex) value).index));
+            if(s.length()==1){
+                return s.charAt(0);
+            }
+            double ret=0.0;
+            try{
+                ret=Double.parseDouble(s);
+            }catch(NumberFormatException nex){
+                
+            }
+            return ret;
+        }
         return super.toNumber();
     }
 
@@ -81,6 +108,20 @@ public class DirectValueTreeItem extends TreeItem {
         if (value instanceof Long) {
             return ((Long) value) != 0;
         }
+        if (value instanceof String) {
+            String s=(String) value;
+            if(s.length()==1){
+                return toNumber()==0;
+            }
+            return !s.equals("");
+        }
+        if (value instanceof ConstantIndex) {
+            String s=(this.constants.get(((ConstantIndex) value).index));
+            if(s.length()==1){
+                return toNumber()==0;
+            }
+            return !s.equals("");
+        }
         return false;
     }
 
@@ -148,6 +189,9 @@ public class DirectValueTreeItem extends TreeItem {
 
     @Override
     public boolean isCompileTime() {
-        return (value instanceof Double) || (value instanceof Float) || (value instanceof Boolean) || (value instanceof Long) || (value instanceof Null) || (computedRegValue != null && computedRegValue.isCompileTime());
+        return (value instanceof Double) || (value instanceof Float) || (value instanceof Boolean) || (value instanceof Long) || (value instanceof Null) || (computedRegValue != null && computedRegValue.isCompileTime())
+                
+               //||(value instanceof String) || (value instanceof ConstantIndex)
+                ;
     }
 }
diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/Graph.java b/trunk/src/com/jpexs/decompiler/flash/graph/Graph.java
index 5f8cf21ec..733c45f4a 100644
--- a/trunk/src/com/jpexs/decompiler/flash/graph/Graph.java
+++ b/trunk/src/com/jpexs/decompiler/flash/graph/Graph.java
@@ -1318,6 +1318,9 @@ public class Graph {
                 ip++;
                 continue;
             }
+            if(ins instanceof GraphSourceItemContainer){
+                ip=code.adr2pos(((GraphSourceItemContainer)ins).getEndAddress());
+            }else
             if (ins.isExit()) {
                 part.end = ip;
                 allBlocks.add(part);
diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/GraphPart.java b/trunk/src/com/jpexs/decompiler/flash/graph/GraphPart.java
index 5ffe2d9fa..810c2e452 100644
--- a/trunk/src/com/jpexs/decompiler/flash/graph/GraphPart.java
+++ b/trunk/src/com/jpexs/decompiler/flash/graph/GraphPart.java
@@ -59,8 +59,7 @@ public class GraphPart {
         return false;
     }
 
-    public boolean leadsTo(GraphSource code, GraphPart part, List<GraphPart> ignored) {
-
+    public boolean leadsTo(GraphSource code, GraphPart part, List<GraphPart> ignored) {        
         return leadsTo(code, part, new ArrayList<GraphPart>(), ignored);
     }
 
diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/GraphSourceItemContainer.java b/trunk/src/com/jpexs/decompiler/flash/graph/GraphSourceItemContainer.java
new file mode 100644
index 000000000..310f6f11c
--- /dev/null
+++ b/trunk/src/com/jpexs/decompiler/flash/graph/GraphSourceItemContainer.java
@@ -0,0 +1,26 @@
+package com.jpexs.decompiler.flash.graph;
+
+import com.jpexs.decompiler.flash.action.Action;
+import com.jpexs.decompiler.flash.graph.GraphTargetItem;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Stack;
+
+/**
+ *
+ * @author JPEXS
+ */
+public interface GraphSourceItemContainer {
+
+    public byte[] getHeaderBytes();
+
+    public List<GraphSourceItem> getItems(List<GraphSourceItem> parent);
+
+    public int getDataLength();
+    
+    public long getEndAddress();
+    
+    public void setEndAddress(long address);
+    
+    public void translateContainer(List<GraphTargetItem> content,Stack<GraphTargetItem> stack, List<GraphTargetItem> output, HashMap<Integer, String> regNames, HashMap<String, GraphTargetItem> variables, HashMap<String, GraphTargetItem> functions);
+}