diff --git a/EMLGenerator.m b/EMLGenerator.m
index d9b17f825912751bafe616a5cf92a027d2cb04a8..751f65b2dd008379dd0e725fdc15b54a927295e6 100644
--- a/EMLGenerator.m
+++ b/EMLGenerator.m
@@ -90,7 +90,7 @@ classdef EMLGenerator < handle
         function code = generate_eml_code(obj)
             code = [];
             code = [code obj.generate_preamble];
-            code = [code obj.generate_conditional(obj.data.Grid1,obj.data.Grid2)];
+            code = [code obj.generate_conditional(obj.data.Grid1,obj.data.Grid2,0)];
             
         end
         
@@ -142,7 +142,7 @@ classdef EMLGenerator < handle
                         code = [code sprintf('%selseif(%s)\n',space,strtrim(char(g1.cells(j).cond_text)))];
                     end
                     
-                    cell = obj.Grid0.search_return(g1.cells(j),g2.cells(1));
+                    cell = obj.data.Grid0.search_return(g1.cells(j),g2.cells(1));
                     if(~isempty(cell))
                         depth = depth + 1;
                         space = [];
@@ -173,7 +173,7 @@ classdef EMLGenerator < handle
                 if (~isempty(elsecell))
                     code = [code sprintf('%selse\n',space)];
 
-                    cell = obj.Grid0.search_return(elsecell,g2.cells(1));
+                    cell = obj.data.Grid0.search_return(elsecell,g2.cells(1));
                     if(~isempty(cell))
                         depth = depth + 1;
                         space = [];
@@ -250,7 +250,7 @@ classdef EMLGenerator < handle
                                     end
                                 end
                                 
-                                cell = obj.Grid0.search_return(g1.cells(j),g2.cells(i))
+                                cell = obj.data.Grid0.search_return(g1.cells(j),g2.cells(i))
                                 if(~isempty(cell))
                                     depth = depth + 1;
                                     space = [];
@@ -284,7 +284,7 @@ classdef EMLGenerator < handle
                                 if (~isempty(elsecell1))
                                     code = [code sprintf('%selse\n',space)];
 
-                                    cell = obj.Grid0.search_return(elsecell1,g2.cells(i))
+                                    cell = obj.data.Grid0.search_return(elsecell1,g2.cells(i))
                                     if(~isempty(cell))
                                         depth = depth + 1;
                                         space = [];
@@ -353,7 +353,7 @@ classdef EMLGenerator < handle
                                     end
                                 end
                                 
-                                cell = obj.Grid0.search_return(g1.cells(j),g2.cells(elseindex));
+                                cell = obj.data.Grid0.search_return(g1.cells(j),g2.cells(elseindex));
                                 if(~isempty(cell))
                                     depth = depth + 1;
                                     space = [];
@@ -387,7 +387,7 @@ classdef EMLGenerator < handle
                                 if (~isempty(elsecell1))
                                     code = [code sprintf('%selse\n',space)];
 
-                                    cell = obj.Grid0.search_return(elsecell1,g2.cells(elseindex));
+                                    cell = obj.data.Grid0.search_return(elsecell1,g2.cells(elseindex));
                                     if(~isempty(cell))
                                         depth = depth + 1;
                                         space = [];
diff --git a/GUI.m b/GUI.m
index e014a65fe9a7f0dbb9c0dbfe350a48184cac5fd9..3f3aeba557bd169829632d9f0d667ab844534964 100644
--- a/GUI.m
+++ b/GUI.m
@@ -491,7 +491,7 @@ classdef GUI < handle
                 %code = [code object.generate_code(object.Grid1,object.Grid2,0)];
                 %fprintf('%s',code);
 
-               TableBlock.set_code(object.block_handle,code,obj.data.function_name);
+               TableBlock.set_code(object.block_handle,code,object.Data.function_name);
 
                 
                 
diff --git a/TableBlock.m b/TableBlock.m
index d3c0cc8e07a584deb8a5e2c7fa3357c16d9ad5e2..4682948e743ae0f7a50ad3e41f9db5fe837cd56a 100644
--- a/TableBlock.m
+++ b/TableBlock.m
@@ -112,7 +112,7 @@ classdef TableBlock < handle
                     % for each line, call delete_recursive if handle still exist
                     for i=1:length( lines )
                         if ishandle( lines( i ) )
-                            object.delete_recursive( lines( i ) )
+                            TableBlock.delete_recursive( lines( i ) )
                         end
                     end
                 % end copyright
@@ -236,7 +236,7 @@ classdef TableBlock < handle
                     % for each line, call delete_recursive if handle still exist
                     for i=1:length( lines )
                         if ishandle( lines( i ) )
-                            object.delete_recursive( lines( i ) )
+                            TableBlock.delete_recursive( lines( i ) )
                         end
                     end   
                 % end copyright