diff --git a/.DS_Store b/.DS_Store
index 3d225e777d994250b663bfcf8d49bf3e11bf03c0..cf3e079f90b868d3d663a2b52808748cdda90249 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/Frontend Angular 4/src/app/layout/plotter/graph2D/graph2D.component.ts b/Frontend Angular 4/src/app/layout/plotter/graph2D/graph2D.component.ts
index ce7ad9d4c9222a1d7e215be1165504f7c37c199f..ef96a556c6f16577ab451f86d3a3db3ab496ab3b 100755
--- a/Frontend Angular 4/src/app/layout/plotter/graph2D/graph2D.component.ts	
+++ b/Frontend Angular 4/src/app/layout/plotter/graph2D/graph2D.component.ts	
@@ -1016,6 +1016,7 @@ createListFunction = function (graph) {
         arrayFunction.push(funcionString);   
         var funcionString = '';
     }
+    console.log(arrayFunction[0])
     return arrayFunction;
 }
 
@@ -1168,19 +1169,41 @@ generateFunctionAndExp = function (exp,graph,namefun6) {
             aux7[0]= aux27;
             aux7[1] = aux17;
             myList.push(aux7);
-        }else{
+        
+        }else if (exp.args[0].kind == 'app'){
+            var aux101 = [];
+            var aux1101 = exp.fun+'('+ exp.args.map(e => this.generarExpresion(e)).join() +')';
+            var aux2101 = 'N'
+            aux101[0]= aux2101;
+            aux101[1] = aux1101;
+            myList.push(aux101);
+        
+
+        }else if(((exp.args[0].kind == 'cnd' || exp.args[0].kind == 'bop') && (exp.args[0].exp1.kind == 'app' || exp.args[0].exp2.kind == 'app' )) || (exp.args[0].kind == 'uop' && exp.args[0].exp.kind == 'app') ){
+            var aux102 = [];
+            var aux1102 = exp.fun+'('+ exp.args.map(e => this.generarExpresion(e)).join() +')';
+            var aux2102 = 'N'
+            aux102[0]= aux2102;
+            aux102[1] = aux1102;
+            myList.push(aux102);
+        }else{ 
+
             if(!namefun6.includes(exp.fun)){
+
+
                 var ListnameFNew = namefun6;
                 ListnameFNew.push(exp.fun);
                 for (var fun5 of graph.funs){
                     if(fun5.fun == exp.fun){
+                        fun5.bdy.args = exp.args;
                          myList = this.generateFunctionAndExp(fun5.bdy,graph,ListnameFNew);
                     }
                 }
             }else{
+
                 var aux76 = [];
                 aux76[0] = 'N';
-                aux76[1] = exp.fun;
+                aux76[1] = exp.fun + "("+exp.args.map(e => this.generarExpresion(e)).join()+")";
                 myList.push(aux76);
             }
         }