fix var when assigning

33 files changed, 816 insertions, 807 deletions

diff --git a/js/NonLinear/ABSBLK_f.pickle b/js/NonLinear/ABSBLK_f.pickle
index 87117beb..857864e5 100644
--- a/js/NonLinear/ABSBLK_f.pickle
+++ b/js/NonLinear/ABSBLK_f.pickle
@@ -7,31 +7,31 @@ p2
 atp3
 Rp4
 .(dp0
-S'this.x'
+S'model.sim'
 p1
-S'double'
+S'vector'
 p2
-sS'model.sim'
+sS'model.in1'
 p3
-S'vector'
+S'double'
 p4
-sS'model.in1'
-p5
-g2
 sS'model.blocktype'
-p6
+p5
 S'string'
-p7
+p6
 sS'model.dep_ut'
+p7
+g2
+sS'model.out'
 p8
 g4
-sS'model.out'
+sS'gr_i'
 p9
 g2
-sS'gr_i'
-p10
-g4
 sS'y'
+p10
+g2
+sS'x'
 p11
 g4
 sS'model'
@@ -40,5 +40,5 @@ S'object'
 p13
 sS'typ'
 p14
-g4
+g2
 s.
\ No newline at end of file
diff --git a/js/NonLinear/ABS_VALUE.pickle b/js/NonLinear/ABS_VALUE.pickle
index f0f47537..835aded5 100644
--- a/js/NonLinear/ABS_VALUE.pickle
+++ b/js/NonLinear/ABS_VALUE.pickle
@@ -9,63 +9,63 @@ p3
 atp4
 Rp5
 .(dp0
-S'this.x'
+S'model.sim'
 p1
-S'double'
+S'vector'
 p2
-sS'model.sim'
+sS'model.in1'
 p3
-S'vector'
+S'double'
 p4
-sS'model.in1'
-p5
-g2
 sS'model.blocktype'
-p6
+p5
 S'string'
+p6
+sS'x.graphics'
 p7
-sS'this.x.model'
+S'object'
 p8
-NsS'this.x.graphics'
+sS'arg1'
 p9
-S'object'
+g8
+sS'graphics.exprs'
 p10
-sS'arg1'
+NsS'model.nmode'
 p11
-g10
-sS'graphics.exprs'
+g4
+sS'model.out'
 p12
-NsS'model.nmode'
+g4
+sS'model.nzcross'
 p13
-g2
-sS'model.out'
+g4
+sS'exprs'
 p14
 g2
-sS'model.nzcross'
+sS'x.model'
 p15
-g2
-sS'exprs'
+NsS'gr_i'
 p16
-g4
-sS'gr_i'
-p17
-g4
+g2
 sS'model.dep_ut'
-p18
-g4
+p17
+g2
 sS'graphics'
-p19
-g10
+p18
+g8
 sS'y'
+p19
+g2
+sS'x'
 p20
 g4
 sS'model'
 p21
-g10
+g8
 sS'typ'
 p22
-g4
+g2
 sS'nu'
 p23
-g2
+g4
 s.
\ No newline at end of file
diff --git a/js/NonLinear/COSBLK_f.pickle b/js/NonLinear/COSBLK_f.pickle
index 00643e69..4250eb27 100644
--- a/js/NonLinear/COSBLK_f.pickle
+++ b/js/NonLinear/COSBLK_f.pickle
@@ -7,41 +7,41 @@ p2
 atp3
 Rp4
 .(dp0
-S'this.x'
+S'model.sim'
 p1
-S'double'
+S'string'
 p2
-sS'model.sim'
+sS'model.in1'
 p3
-S'string'
+S'double'
 p4
-sS'model.in1'
+sS'model.blocktype'
 p5
 g2
-sS'model.blocktype'
+sS'in1'
 p6
 g4
-sS'in1'
-p7
-g2
 sS'model.dep_ut'
-p8
+p7
 S'vector'
-p9
+p8
 sS'model.out'
-p10
-g2
+p9
+g4
 sS'gr_i'
-p11
-g9
+p10
+g8
 sS'y'
+p11
+g8
+sS'x'
 p12
-g9
+g4
 sS'model'
 p13
 S'object'
 p14
 sS'typ'
 p15
-g9
+g8
 s.
\ No newline at end of file
diff --git a/js/NonLinear/DLRADAPT_f.js b/js/NonLinear/DLRADAPT_f.js
index 3bb3e9bd..7845c28a 100644
--- a/js/NonLinear/DLRADAPT_f.js
+++ b/js/NonLinear/DLRADAPT_f.js
@@ -38,12 +38,12 @@ function DLRADAPT_f() {
         return options;
     }
     DLRADAPT_f.prototype.set = function DLRADAPT_f() {
-        this.p = parseFloat((arguments[0]["p"]))
-        this.rn = parseFloat((arguments[0]["rn"]))
-        this.rd = parseFloat((arguments[0]["rd"]))
-        this.g = parseFloat((arguments[0]["g"]))
-        this.last_u = parseFloat((arguments[0]["last_u"]))
-        this.last_y = parseFloat((arguments[0]["last_y"]))
+        this.p = inverse((arguments[0]["p"]))
+        this.rn = inverse((arguments[0]["rn"]))
+        this.rd = inverse((arguments[0]["rd"]))
+        this.g = inverse((arguments[0]["g"]))
+        this.last_u = inverse((arguments[0]["last_u"]))
+        this.last_y = inverse((arguments[0]["last_y"]))
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
diff --git a/js/NonLinear/DLRADAPT_f.pickle b/js/NonLinear/DLRADAPT_f.pickle
index a4eeb113..71032709 100644
--- a/js/NonLinear/DLRADAPT_f.pickle
+++ b/js/NonLinear/DLRADAPT_f.pickle
@@ -23,96 +23,96 @@ S'model.dstate'
 p1
 S'matrix'
 p2
-sS'this.rd'
-p3
-g2
 sS'arg1'
-p4
+p3
 S'object'
-p5
+p4
 sS'graphics'
+p5
+g4
+sS'rpar'
 p6
-g5
-sS'this.rn'
+g2
+sS'x.model'
 p7
-S'vector'
+NsS'model.out'
 p8
-sS'rpar'
+S'double'
 p9
-g2
-sS'this.x.model'
+sS'model.in1'
 p10
-NsS'model.out'
+g2
+sS'x.graphics'
 p11
-S'double'
+g4
+sS'rd'
 p12
-sS'model.in1'
-p13
 g2
-sS'typ'
-p14
-g8
 sS'model.evtin'
+p13
+g9
+sS'rn'
+p14
+S'vector'
 p15
-g12
 sS'model.firing'
 p16
-g8
-sS'this.x'
-p17
-g12
+g15
 sS'model.sim'
-p18
+p17
 S'string'
+p18
+sS'last_y'
 p19
-sS'this.p'
+g2
+sS'exprs'
 p20
 g2
 sS'model.rpar'
 p21
 g2
-sS'model.blocktype'
+sS'last_u'
 p22
-g19
+g15
 sS'graphics.exprs'
 p23
 NsS'model.ipar'
 p24
 g2
-sS'this.x.graphics'
+sS'typ'
 p25
-g5
-sS'this.g'
+g15
+sS'model.blocktype'
 p26
-g2
-sS'this.last_y'
+g18
+sS'g'
 p27
 g2
 sS'[npt,n]'
 p28
-g12
+g9
 sS'm'
 p29
-g12
+g9
 sS'model.dep_ut'
 p30
-g8
-sS'exprs'
+g15
+sS'p'
 p31
 g2
 sS'gr_i'
 p32
-g8
+g15
 sS'ipar'
 p33
 g2
-sS'this.last_u'
-p34
-g8
 sS'y'
+p34
+g15
+sS'x'
 p35
-g8
+g9
 sS'model'
 p36
-g5
+g4
 s.
\ No newline at end of file
diff --git a/js/NonLinear/EXPBLK_f.pickle b/js/NonLinear/EXPBLK_f.pickle
index 1f4497ab..adee4513 100644
--- a/js/NonLinear/EXPBLK_f.pickle
+++ b/js/NonLinear/EXPBLK_f.pickle
@@ -9,7 +9,7 @@ p3
 atp4
 Rp5
 .(dp0
-S'this.x'
+S'a'
 p1
 S'double'
 p2
@@ -23,7 +23,7 @@ g2
 sS'model.blocktype'
 p6
 g4
-sS'this.x.graphics'
+sS'x.graphics'
 p7
 S'object'
 p8
@@ -38,25 +38,26 @@ p11
 g2
 sS'model.rpar'
 p12
-NsS'this.x.model'
+g2
+sS'exprs'
 p13
-NsS'exprs'
-p14
 S'vector'
+p14
+sS'x.model'
 p15
-sS'gr_i'
+NsS'gr_i'
 p16
-g15
+g14
 sS'model.dep_ut'
 p17
-g15
+g14
 sS'graphics'
 p18
 g8
 sS'y'
 p19
-g15
-sS'this.a'
+g14
+sS'x'
 p20
 g2
 sS'model'
@@ -64,7 +65,7 @@ p21
 g8
 sS'typ'
 p22
-g15
+g14
 sS'model.out'
 p23
 g2
diff --git a/js/NonLinear/EXPBLK_m.pickle b/js/NonLinear/EXPBLK_m.pickle
index de5b5f4e..12c33242 100644
--- a/js/NonLinear/EXPBLK_m.pickle
+++ b/js/NonLinear/EXPBLK_m.pickle
@@ -16,67 +16,68 @@ p2
 sS'graphics'
 p3
 g2
-sS'model.intyp'
+sS'x.model'
 p4
-S'double'
+NsS'model.intyp'
 p5
-sS'this.x.model'
+S'double'
 p6
-NsS'model.out'
+sS'model.out'
 p7
-g5
+g6
 sS'model.in2'
 p8
-g5
+g6
 sS'model.in1'
 p9
-g5
-sS'typ'
+g6
+sS'x.graphics'
 p10
-S'vector'
+g2
+sS'model.sim'
 p11
-sS'this.x'
+S'vector'
 p12
-g5
-sS'model.sim'
-p13
-g11
 sS'model.out2'
-p14
-g5
+p13
+g6
 sS'in1'
-p15
-g5
+p14
+g6
 sS'model.rpar'
+p15
+g6
+sS'y'
 p16
-NsS'model.outtyp'
-p17
-g5
+g12
 sS'graphics.exprs'
+p17
+g6
+sS'typ'
 p18
-g5
-sS'this.a'
+g12
+sS'a'
 p19
-g5
-sS'this.x.graphics'
-p20
-g2
+g6
 sS'model.blocktype'
-p21
+p20
 S'string'
-p22
+p21
 sS'model.dep_ut'
-p23
-g11
+p22
+g12
 sS'exprs'
-p24
-g11
+p23
+g12
 sS'gr_i'
+p24
+g12
+sS'model.outtyp'
 p25
-g11
-sS'y'
+g6
+sS'x'
 p26
-g11
+g6
 sS'model'
 p27
 g2
diff --git a/js/NonLinear/FSV_f.pickle b/js/NonLinear/FSV_f.pickle
index 56f64ce5..595df316 100644
--- a/js/NonLinear/FSV_f.pickle
+++ b/js/NonLinear/FSV_f.pickle
@@ -7,37 +7,37 @@ p2
 atp3
 Rp4
 .(dp0
-S'this.x'
+S'model.sim'
 p1
-S'double'
+S'vector'
 p2
-sS'model.sim'
+sS'model.in1'
 p3
-S'vector'
+S'double'
 p4
-sS'model.in1'
-p5
-g2
 sS'model.blocktype'
-p6
+p5
 S'string'
-p7
+p6
 sS'exprs'
-p8
-g7
+p7
+g6
 sS'in1'
+p8
+g4
+sS'model.dep_ut'
 p9
 g2
-sS'model.dep_ut'
+sS'model.out'
 p10
 g4
-sS'model.out'
+sS'gr_i'
 p11
 g2
-sS'gr_i'
-p12
-g4
 sS'y'
+p12
+g2
+sS'x'
 p13
 g4
 sS'model'
@@ -46,5 +46,5 @@ S'object'
 p15
 sS'typ'
 p16
-g4
+g2
 s.
\ No newline at end of file
diff --git a/js/NonLinear/INTRP2BLK_f.js b/js/NonLinear/INTRP2BLK_f.js
index 792d9598..2ac420d8 100644
--- a/js/NonLinear/INTRP2BLK_f.js
+++ b/js/NonLinear/INTRP2BLK_f.js
@@ -29,9 +29,9 @@ function INTRP2BLK_f() {
         return options;
     }
     INTRP2BLK_f.prototype.set = function INTRP2BLK_f() {
-        this.a = parseFloat((arguments[0]["a"]))
-        this.b = parseFloat((arguments[0]["b"]))
-        this.c = parseFloat((arguments[0]["c"]))
+        this.a = inverse((arguments[0]["a"]))
+        this.b = inverse((arguments[0]["b"]))
+        this.c = inverse((arguments[0]["c"]))
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
diff --git a/js/NonLinear/INTRP2BLK_f.pickle b/js/NonLinear/INTRP2BLK_f.pickle
index f89a9182..aedc2222 100644
--- a/js/NonLinear/INTRP2BLK_f.pickle
+++ b/js/NonLinear/INTRP2BLK_f.pickle
@@ -13,43 +13,45 @@ p5
 atp6
 Rp7
 .(dp0
-S'this.x'
+S'a'
 p1
-S'double'
+S'matrix'
 p2
 sS'model.sim'
 p3
 S'vector'
 p4
-sS'model.in1'
+sS'c'
 p5
-S'matrix'
+g2
+sS'b'
 p6
-sS'this.c'
-p7
-g6
+g2
 sS'model.blocktype'
-p8
+p7
 S'string'
+p8
+sS'x.graphics'
 p9
-sS'this.x.graphics'
-p10
 S'object'
-p11
+p10
 sS'arg1'
-p12
-g11
+p11
+g10
 sS'graphics.exprs'
+p12
+NsS'model.in1'
 p13
-NsS'model.rpar'
+g2
+sS'model.rpar'
 p14
-g6
-sS'this.x.model'
+g2
+sS'exprs'
 p15
-NsS'exprs'
+g2
+sS'x.model'
 p16
-g6
-sS'gr_i'
+NsS'gr_i'
 p17
 g4
 sS'model.dep_ut'
@@ -57,26 +59,24 @@ p18
 g4
 sS'graphics'
 p19
-g11
+g10
 sS'y'
 p20
 g4
-sS'this.a'
+sS'x'
 p21
-g6
-sS'model'
+S'double'
 p22
-g11
-sS'model.ipar'
+sS'model'
 p23
-g6
-sS'typ'
+g10
+sS'model.ipar'
 p24
-g4
-sS'this.b'
+g2
+sS'typ'
 p25
-g6
+g4
 sS'model.out'
 p26
-g2
+g22
 s.
\ No newline at end of file
diff --git a/js/NonLinear/INTRPLBLK_f.js b/js/NonLinear/INTRPLBLK_f.js
index 17a4d514..28c0d0e4 100644
--- a/js/NonLinear/INTRPLBLK_f.js
+++ b/js/NonLinear/INTRPLBLK_f.js
@@ -26,8 +26,8 @@ function INTRPLBLK_f() {
         return options;
     }
     INTRPLBLK_f.prototype.set = function INTRPLBLK_f() {
-        this.a = parseFloat((arguments[0]["a"]))
-        this.b = parseFloat((arguments[0]["b"]))
+        this.a = inverse((arguments[0]["a"]))
+        this.b = inverse((arguments[0]["b"]))
         this.x = arg1;
         graphics = arg1.graphics;
         exprs = graphics.exprs;
diff --git a/js/NonLinear/INTRPLBLK_f.pickle b/js/NonLinear/INTRPLBLK_f.pickle
index a258183d..81a74125 100644
--- a/js/NonLinear/INTRPLBLK_f.pickle
+++ b/js/NonLinear/INTRPLBLK_f.pickle
@@ -11,9 +11,9 @@ p4
 atp5
 Rp6
 .(dp0
-S'this.x'
+S'a'
 p1
-S'double'
+S'matrix'
 p2
 sS'model.sim'
 p3
@@ -21,54 +21,54 @@ S'string'
 p4
 sS'model.in1'
 p5
-g2
-sS'model.blocktype'
+S'double'
 p6
-g4
-sS'this.x.graphics'
+sS'b'
 p7
-S'object'
+g2
+sS'model.blocktype'
 p8
-sS'arg1'
+g4
+sS'x.graphics'
 p9
-g8
-sS'graphics.exprs'
+S'object'
 p10
-NsS'model.rpar'
+sS'arg1'
 p11
-S'matrix'
+g10
+sS'graphics.exprs'
 p12
-sS'this.x.model'
+NsS'model.rpar'
 p13
-NsS'exprs'
+g2
+sS'exprs'
 p14
-g12
-sS'gr_i'
+g2
+sS'x.model'
 p15
-S'vector'
+NsS'gr_i'
 p16
-sS'model.dep_ut'
+S'vector'
 p17
-g16
-sS'graphics'
+sS'model.dep_ut'
 p18
-g8
-sS'y'
+g17
+sS'graphics'
 p19
-g16
-sS'this.a'
+g10
+sS'y'
 p20
-g12
-sS'model'
+g17
+sS'x'
 p21
-g8
-sS'typ'
+g6
+sS'model'
 p22
-g16
-sS'this.b'
+g10
+sS'typ'
 p23
-g12
+g17
 sS'model.out'
 p24
-g2
+g6
 s.
\ No newline at end of file
diff --git a/js/NonLinear/INVBLK.pickle b/js/NonLinear/INVBLK.pickle
index 56f64ce5..595df316 100644
--- a/js/NonLinear/INVBLK.pickle
+++ b/js/NonLinear/INVBLK.pickle
@@ -7,37 +7,37 @@ p2
 atp3
 Rp4
 .(dp0
-S'this.x'
+S'model.sim'
 p1
-S'double'
+S'vector'
 p2
-sS'model.sim'
+sS'model.in1'
 p3
-S'vector'
+S'double'
 p4
-sS'model.in1'
-p5
-g2
 sS'model.blocktype'
-p6
+p5
 S'string'
-p7
+p6
 sS'exprs'
-p8
-g7
+p7
+g6
 sS'in1'
+p8
+g4
+sS'model.dep_ut'
 p9
 g2
-sS'model.dep_ut'
+sS'model.out'
 p10
 g4
-sS'model.out'
+sS'gr_i'
 p11
 g2
-sS'gr_i'
-p12
-g4
 sS'y'
+p12
+g2
+sS'x'
 p13
 g4
 sS'model'
@@ -46,5 +46,5 @@ S'object'
 p15
 sS'typ'
 p16
-g4
+g2
 s.
\ No newline at end of file
diff --git a/js/NonLinear/INVBLK_f.pickle b/js/NonLinear/INVBLK_f.pickle
index 198d8c45..102457e9 100644
--- a/js/NonLinear/INVBLK_f.pickle
+++ b/js/NonLinear/INVBLK_f.pickle
@@ -7,44 +7,44 @@ p2
 atp3
 Rp4
 .(dp0
-S'this.x'
+S'model.sim'
 p1
-S'double'
+S'string'
 p2
-sS'model.sim'
+sS'model.in1'
 p3
-S'string'
+S'double'
 p4
-sS'model.in1'
+sS'model.blocktype'
 p5
 g2
-sS'model.blocktype'
-p6
-g4
 sS'exprs'
+p6
+g2
+sS'in1'
 p7
 g4
-sS'in1'
-p8
-g2
 sS'model.dep_ut'
-p9
+p8
 S'vector'
-p10
+p9
 sS'model.out'
-p11
-g2
+p10
+g4
 sS'gr_i'
-p12
-g10
+p11
+g9
 sS'y'
+p12
+g9
+sS'x'
 p13
-g10
+g4
 sS'model'
 p14
 S'object'
 p15
 sS'typ'
 p16
-g10
+g9
 s.
\ No newline at end of file
diff --git a/js/NonLinear/LOGBLK_f.pickle b/js/NonLinear/LOGBLK_f.pickle
index bea5fb25..ab05e8c5 100644
--- a/js/NonLinear/LOGBLK_f.pickle
+++ b/js/NonLinear/LOGBLK_f.pickle
@@ -9,7 +9,7 @@ p3
 atp4
 Rp5
 .(dp0
-S'this.x'
+S'a'
 p1
 S'double'
 p2
@@ -23,7 +23,7 @@ g2
 sS'model.blocktype'
 p6
 g4
-sS'this.x.graphics'
+sS'x.graphics'
 p7
 S'object'
 p8
@@ -38,12 +38,13 @@ p11
 g2
 sS'model.rpar'
 p12
-NsS'this.x.model'
+g2
+sS'exprs'
 p13
-NsS'exprs'
-p14
 g4
-sS'gr_i'
+sS'x.model'
+p14
+NsS'gr_i'
 p15
 S'vector'
 p16
@@ -56,7 +57,7 @@ g8
 sS'y'
 p19
 g16
-sS'this.a'
+sS'x'
 p20
 g2
 sS'model'
diff --git a/js/NonLinear/LOOKUP2D.js b/js/NonLinear/LOOKUP2D.js
index 3307c02b..c83c9632 100644
--- a/js/NonLinear/LOOKUP2D.js
+++ b/js/NonLinear/LOOKUP2D.js
@@ -35,9 +35,9 @@ function LOOKUP2D() {
         return options;
     }
     LOOKUP2D.prototype.set = function LOOKUP2D() {
-        this.xx = parseFloat((arguments[0]["xx"]))
-        this.yy = parseFloat((arguments[0]["yy"]))
-        this.zz = parseFloat((arguments[0]["zz"]))
+        this.xx = inverse((arguments[0]["xx"]))
+        this.yy = inverse((arguments[0]["yy"]))
+        this.zz = inverse((arguments[0]["zz"]))
         this.Method = parseFloat((arguments[0]["Method"]))
         this.graf = parseFloat((arguments[0]["graf"]))
         this.x = arg1;
diff --git a/js/NonLinear/LOOKUP2D.pickle b/js/NonLinear/LOOKUP2D.pickle
index 4db8982e..50350631 100644
--- a/js/NonLinear/LOOKUP2D.pickle
+++ b/js/NonLinear/LOOKUP2D.pickle
@@ -40,110 +40,110 @@ g2
 sS'Ny'
 p9
 g2
-sS'Ask_again'
+sS'xx'
 p10
-g7
-sS'model.out'
+S'vector'
 p11
-g2
-sS'curwin'
+sS'zz'
 p12
-NsS'gh'
+S'matrix'
 p13
-g5
-sS'[nz,mz]'
+sS'Ask_again'
 p14
-g2
-sS'exprs[4-1]'
+g7
+sS'model.out'
 p15
 g2
-sS'gh2'
+sS'curwin'
 p16
-g2
-sS'exprs'
+NsS'Method'
 p17
-S'vector'
+g2
+sS'gh'
 p18
-sS'this.x.graphics'
-p19
 g5
-sS'this.Method'
+sS'[nz,mz]'
+p19
+g2
+sS'exprs[4-1]'
 p20
 g2
-sS'this.xx'
+sS'gh2'
 p21
-g18
-sS'this.zz'
+g2
+sS'gh.figure_id'
 p22
-S'matrix'
+NsS'METHOD'
 p23
-sS'METHOD'
-p24
 S'string'
+p24
+sS'model.sim'
 p25
-sS'this.x'
+g11
+sS'model.in1'
 p26
-g2
-sS'model.sim'
+g13
+sS'model.rpar'
 p27
-g18
-sS'model.in1'
+g13
+sS'yy'
 p28
-g23
-sS'model.rpar'
+g11
+sS'exprs[5-1]'
 p29
-g23
-sS'this.x.model'
-p30
-NsS'exprs[5-1]'
-p31
-g25
+g24
 sS'graphics'
-p32
+p30
 g5
 sS'model.ipar'
-p33
-g23
+p31
+g13
 sS'typ'
+p32
+g11
+sS'Graf'
+p33
+g24
+sS'model.blocktype'
 p34
-g18
-sS'gh.figure_id'
+g24
+sS'ok'
 p35
-NsS'Graf'
+g7
+sS'save_curwin'
 p36
-g25
-sS'model.blocktype'
+NsS'[ok]'
 p37
-g25
-sS'ok'
+g2
+sS'x.graphics'
 p38
-g7
-sS'save_curwin'
+g5
+sS'x.model'
 p39
-NsS'[ok]'
+NsS'model.dep_ut'
 p40
-g2
-sS'this.yy'
+g11
+sS'exprs'
 p41
-g18
-sS'model.dep_ut'
+g11
+sS'gr_i'
 p42
-g18
-sS'this.graf'
+g11
+sS'mtd'
 p43
-g25
-sS'gr_i'
-p44
-g18
+g2
 sS'graphics.exprs'
-p45
+p44
 NsS'y'
+p45
+g11
+sS'x'
 p46
-g18
+g2
 sS'model'
 p47
 g5
-sS'mtd'
+sS'graf'
 p48
-g2
+g24
 s.
\ No newline at end of file
diff --git a/js/NonLinear/LOOKUP_c.pickle b/js/NonLinear/LOOKUP_c.pickle
index 8a062d1b..5b625185 100644
--- a/js/NonLinear/LOOKUP_c.pickle
+++ b/js/NonLinear/LOOKUP_c.pickle
@@ -94,272 +94,272 @@ sS'model.rpar'
 p25
 S'matrix'
 p26
-sS'Pulse_exprs'
+sS'yy'
 p27
+g26
+sS'Pulse_exprs'
+p28
 g2
 sS'dx'
-p28
+p29
 g13
 sS'dy'
-p29
+p30
 g13
 sS'a.clip_state'
-p30
+p31
 g9
 sS'model.blocktype'
-p31
+p32
 g9
 sS'save_curwin'
-p32
-NsS'oipar'
 p33
+NsS'oipar'
+p34
 g26
 sS'MENU'
-p34
-g2
-sS'this.yy'
 p35
-g26
-sS'model.dep_ut'
+g2
+sS'x.model'
 p36
+NsS'model.dep_ut'
+p37
 g2
 sS'menu_s'
-p37
+p38
 g2
 sS'Sawt1_exprs'
-p38
+p39
 g2
 sS'sample4'
-p39
+p40
 g2
 sS'sTp2'
-p40
+p41
 g2
+sS'x'
+p42
+g13
 sS'[ny,my]'
-p41
+p43
 g13
 sS'exprs[1-1]'
-p42
+p44
 g13
 sS'[nx,mx]'
-p43
+p45
 g13
 sS'arg1'
-p44
-g11
-sS'this.x.model'
-p45
-NsS'Pd3'
 p46
+g11
+sS'Pd3'
+p47
 g2
 sS'sAmp'
-p47
+p48
 g2
 sS'sample5'
-p48
+p49
 g2
 sS'a.title.font_style'
-p49
+p50
 g13
 sS'orpar'
-p50
+p51
 g26
+sS'x.graphics'
+p52
+g11
 sS'menu_d'
-p51
+p53
 g2
 sS'menu_e'
-p52
+p54
 g2
 sS'r'
-p53
+p55
 g9
 sS'seed4'
-p54
+p56
 g2
 sS'seed5'
-p55
+p57
 g2
 sS'model.evtin'
-p56
+p58
 g2
 sS'menu_t'
-p57
+p59
 g2
 sS'menu_r'
-p58
+p60
 g2
 sS'PO'
-p59
-g13
-sS'this.x'
-p60
+p61
 g13
 sS'DChange'
-p61
+p62
 g5
 sS'[Xdummy,Ydummy,orpar]'
-p62
+p63
 g13
 sS'model.out2'
-p63
+p64
 g13
 sS'xy[N-1][2-1]'
-p64
+p65
 g13
 sS'sTp'
-p65
+p66
 g2
 sS'wp'
-p66
+p67
 g2
 sS'New_methhod'
-p67
+p68
 g13
 sS'PeridicOption'
-p68
+p69
 g13
 sS'Graf'
-p69
+p70
 g9
 sS'ok'
-p70
+p71
 g5
 sS'w'
-p71
+p72
 g9
 sS'model.outtyp'
-p72
+p73
+g13
+sS'extrapo'
+p74
 g13
 sS'offset'
-p73
+p75
 g2
 sS'perop'
-p74
+p76
 g9
+sS'xx'
+p77
+g26
 sS'xy'
-p75
+p78
 g2
 sS'SaveExit'
-p76
+p79
 g5
 sS'xp'
-p77
+p80
 g13
-sS'this.ixy'
-p78
-g2
-sS'this.Method'
-p79
+sS'Method'
+p81
 g13
 sS'[orpar,oipar,ok]'
-p80
+p82
 g13
+sS'ixy'
+p83
+g2
 sS'rect'
-p81
+p84
 g26
 sS'Amp'
-p82
+p85
 g2
 sS'exprs[2-1]'
-p83
+p86
 g13
 sS'model.firing'
-p84
+p87
 g13
 sS'xy2'
-p85
+p88
 g2
 sS'N'
-p86
+p89
 g13
 sS'random_u_exprs'
-p87
+p90
 g2
 sS'Sawt2_exprs'
-p88
+p91
 g2
 sS'graphics'
-p89
+p92
 g11
 sS'Exitm'
-p90
+p93
 g9
 sS'N2'
-p91
+p94
 g13
 sS'model.ipar'
-p92
+p95
 g26
-sS'this.x.graphics'
-p93
-g11
 sS'Pw3'
-p94
+p96
 g2
 sS'f'
-p95
+p97
 g13
 sS'a.grid'
-p96
+p98
 g2
 sS'[this.xy]'
-p97
+p99
 g13
 sS'gr_i'
-p98
+p100
 g2
 sS'ipar'
-p99
+p101
 NsS'mtd'
-p100
+p102
 g13
 sS'scam'
-p101
+p103
 g9
 sS'exprs[4-1]'
-p102
+p104
 g13
 sS'model.evtout'
-p103
+p105
 g2
 sS'rpar'
-p104
+p106
 NsS'np5'
-p105
+p107
 g2
 sS'Bias3'
-p106
+p108
 g2
 sS'Tp3'
-p107
+p109
 g2
 sS'model.out'
-p108
+p110
 g13
 sS'np4'
-p109
+p111
 g2
 sS'np1'
-p110
+p112
 g2
 sS'[xy]'
-p111
+p113
 g13
 sS'model.in2'
-p112
+p114
 g13
 sS'model.in1'
-p113
+p115
 g13
 sS'sAmp2'
-p114
-g2
-sS'this.xx'
-p115
-g26
-sS'this.extrapo'
 p116
-g13
+g2
 sS'menus'
 p117
 g2
diff --git a/js/NonLinear/LOOKUP_f.pickle b/js/NonLinear/LOOKUP_f.pickle
index 9f0ed4f3..602b724e 100644
--- a/js/NonLinear/LOOKUP_f.pickle
+++ b/js/NonLinear/LOOKUP_f.pickle
@@ -13,67 +13,67 @@ S'object'
 p2
 sS'rpar'
 p3
-NsS'xx'
+NsS'x.model'
 p4
-S'vector'
-p5
-sS'this.x.model'
-p6
 g2
 sS'model.out'
-p7
+p5
 S'double'
-p8
+p6
 sS'model.in1'
+p7
+g6
+sS'x.graphics'
+p8
+g2
+sS'model.sim'
 p9
-g8
-sS'typ'
+S'string'
 p10
-g5
-sS'this.x'
+sS'model.rpar'
 p11
-g8
-sS'model.sim'
+S'matrix'
 p12
-S'string'
+sS'yy'
 p13
-sS'model.rpar'
+S'vector'
 p14
-S'matrix'
+sS'graphics'
 p15
-sS'yy'
+g2
+sS'typ'
 p16
-g5
-sS'graphics'
+g14
+sS'[xx,yy,ok,gc]'
 p17
-g2
-sS'this.x.graphics'
+g6
+sS'ok'
 p18
-g2
-sS'[xx,yy,ok,gc]'
+S'boolean'
 p19
-g8
-sS'ok'
+sS'model.blocktype'
 p20
-S'boolean'
+g10
+sS'xx'
 p21
-sS'model.blocktype'
-p22
-g13
+g14
 sS'model.dep_ut'
-p23
-g5
+p22
+g14
 sS'n'
-p24
-g8
+p23
+g6
 sS'exprs'
-p25
+p24
 NsS'gr_i'
-p26
-g5
+p25
+g14
 sS'y'
+p26
+g14
+sS'x'
 p27
-g5
+g6
 sS'model'
 p28
 g2
diff --git a/js/NonLinear/MAXMIN.pickle b/js/NonLinear/MAXMIN.pickle
index 81f663e3..7f130392 100644
--- a/js/NonLinear/MAXMIN.pickle
+++ b/js/NonLinear/MAXMIN.pickle
@@ -20,47 +20,49 @@ p2
 sS'graphics'
 p3
 g2
-sS'this.x.model'
+sS'x.model'
 p4
-NsS'model.out'
+NsS'zcr'
 p5
 S'double'
 p6
-sS'graphics.style'
+sS'model.out'
 p7
-S'string'
+g6
+sS'graphics.style'
 p8
-sS'model.in1'
+S'string'
 p9
-g6
-sS'model.nzcross'
+sS'model.in1'
 p10
-NsS'label'
+g6
+sS'x.graphics'
 p11
-g8
-sS'this.zcr'
+g2
+sS'typ'
 p12
-g6
-sS'this.x'
+S'vector'
 p13
-g6
-sS'model.sim'
+sS'label'
 p14
-S'vector'
+g9
+sS'model.sim'
 p15
+g13
 sS'model.nmode'
 p16
-NsS'this.mm'
-p17
 g6
 sS'graphics.exprs'
+p17
+NsS'x.graphics.style'
 p18
-NsS'model.ipar'
+g9
+sS'model.ipar'
 p19
 g6
-sS'this.x.graphics'
+sS'model.nzcross'
 p20
-g2
+g6
 sS'[model,graphics,ok]'
 p21
 g6
@@ -70,25 +72,25 @@ S'boolean'
 p23
 sS'model.blocktype'
 p24
-g8
-sS'this.x.graphics.style'
+g9
+sS'mm'
 p25
-g8
-sS'typ'
-p26
-g15
+g6
 sS'model.dep_ut'
-p27
-g15
+p26
+g13
 sS'exprs'
-p28
-g15
+p27
+g13
 sS'gr_i'
-p29
-g15
+p28
+g13
 sS'y'
+p29
+g13
+sS'x'
 p30
-g15
+g6
 sS'model'
 p31
 g2
diff --git a/js/NonLinear/MAX_f.pickle b/js/NonLinear/MAX_f.pickle
index 71eb1966..362a6e75 100644
--- a/js/NonLinear/MAX_f.pickle
+++ b/js/NonLinear/MAX_f.pickle
@@ -7,48 +7,48 @@ p2
 atp3
 Rp4
 .(dp0
-S'this.x'
+S'model.sim'
 p1
-S'double'
+S'string'
 p2
-sS'model.sim'
+sS'model.in1'
 p3
-S'string'
+S'double'
 p4
-sS'model.in1'
-p5
-g2
 sS'model.dstate'
-p6
+p5
 S'matrix'
-p7
+p6
 sS'model.blocktype'
-p8
-g4
+p7
+g2
 sS'exprs'
+p8
+g2
+sS'in1'
 p9
 g4
-sS'in1'
-p10
-g2
 sS'model.dep_ut'
-p11
+p10
 S'vector'
-p12
+p11
 sS'model.out'
-p13
-g2
+p12
+g4
 sS'gr_i'
-p14
-g12
+p13
+g11
 sS'y'
+p14
+g11
+sS'x'
 p15
-g12
+g4
 sS'model'
 p16
 S'object'
 p17
 sS'typ'
 p18
-g12
+g11
 s.
\ No newline at end of file
diff --git a/js/NonLinear/MIN_f.pickle b/js/NonLinear/MIN_f.pickle
index 4e4b2455..a8357dc1 100644
--- a/js/NonLinear/MIN_f.pickle
+++ b/js/NonLinear/MIN_f.pickle
@@ -7,48 +7,48 @@ p2
 atp3
 Rp4
 .(dp0
-S'this.x'
+S'model.sim'
 p1
-S'double'
+S'string'
 p2
-sS'model.sim'
+sS'model.in1'
 p3
-S'string'
+S'double'
 p4
-sS'model.in1'
-p5
-g2
 sS'model.dstate'
-p6
+p5
 S'matrix'
-p7
+p6
 sS'model.blocktype'
+p7
+g2
+sS'exprs'
 p8
 g4
-sS'exprs'
-p9
-g2
 sS'in1'
-p10
-g2
+p9
+g4
 sS'model.dep_ut'
-p11
+p10
 S'vector'
-p12
+p11
 sS'model.out'
-p13
-g2
+p12
+g4
 sS'gr_i'
-p14
-g12
+p13
+g11
 sS'y'
+p14
+g11
+sS'x'
 p15
-g12
+g4
 sS'model'
 p16
 S'object'
 p17
 sS'typ'
 p18
-g12
+g11
 s.
\ No newline at end of file
diff --git a/js/NonLinear/POWBLK_f.pickle b/js/NonLinear/POWBLK_f.pickle
index a055dc96..68f9f010 100644
--- a/js/NonLinear/POWBLK_f.pickle
+++ b/js/NonLinear/POWBLK_f.pickle
@@ -9,7 +9,7 @@ p3
 atp4
 Rp5
 .(dp0
-S'this.x'
+S'a'
 p1
 S'double'
 p2
@@ -23,7 +23,7 @@ g2
 sS'model.blocktype'
 p6
 g4
-sS'this.x.graphics'
+sS'x.graphics'
 p7
 S'object'
 p8
@@ -38,12 +38,13 @@ p11
 g2
 sS'model.rpar'
 p12
-NsS'this.x.model'
+g2
+sS'exprs'
 p13
-NsS'exprs'
-p14
 g4
-sS'gr_i'
+sS'x.model'
+p14
+NsS'gr_i'
 p15
 S'vector'
 p16
@@ -56,7 +57,7 @@ g8
 sS'y'
 p19
 g16
-sS'this.a'
+sS'x'
 p20
 g2
 sS'model'
diff --git a/js/NonLinear/PRODUCT.js b/js/NonLinear/PRODUCT.js
index f26c8a9c..12d29acb 100644
--- a/js/NonLinear/PRODUCT.js
+++ b/js/NonLinear/PRODUCT.js
@@ -23,7 +23,7 @@ function PRODUCT() {
         return options;
     }
     PRODUCT.prototype.set = function PRODUCT() {
-        this.sgn = parseFloat((arguments[0]["sgn"]))
+        this.sgn = inverse((arguments[0]["sgn"]))
         this.x = arg1;
         graphics = arg1.graphics;
         model = arg1.model;
diff --git a/js/NonLinear/PRODUCT.pickle b/js/NonLinear/PRODUCT.pickle
index 16866b3f..7b79339b 100644
--- a/js/NonLinear/PRODUCT.pickle
+++ b/js/NonLinear/PRODUCT.pickle
@@ -16,66 +16,67 @@ p2
 sS'graphics'
 p3
 g2
-sS'this.x.model'
+sS'x.model'
 p4
-NsS'model.out'
+NsS'sgn'
 p5
-S'double'
+S'matrix'
 p6
-sS'model.in1'
+sS'model.out'
 p7
-S'matrix'
+S'double'
 p8
-sS'this.sgn'
+sS'model.in1'
 p9
-g8
-sS'typ'
+g6
+sS'x.graphics'
 p10
-S'vector'
+g2
+sS'model.sim'
 p11
-sS'this.x'
+S'vector'
 p12
-g6
-sS'model.sim'
-p13
-g11
 sS'in1'
-p14
-g6
+p13
+g8
 sS'graphics.exprs'
-p15
+p14
 NsS'model.ipar'
+p15
+g6
+sS'typ'
 p16
-NsS'this.x.graphics'
-p17
-g2
+g12
 sS'[model,graphics,ok]'
-p18
-g6
+p17
+g8
 sS'ok'
-p19
+p18
 S'boolean'
-p20
+p19
 sS'model.blocktype'
-p21
+p20
 S'string'
-p22
+p21
 sS'model.dep_ut'
-p23
-g11
+p22
+g12
 sS'exprs'
-p24
-g6
+p23
+g8
 sS'gr_i'
-p25
-g11
+p24
+g12
 sS'y'
+p25
+g12
+sS'x'
 p26
-g11
+g8
 sS'model'
 p27
 g2
 sS'nout'
 p28
-g6
+g8
 s.
\ No newline at end of file
diff --git a/js/NonLinear/PROD_f.pickle b/js/NonLinear/PROD_f.pickle
index d1050b24..4bea59b8 100644
--- a/js/NonLinear/PROD_f.pickle
+++ b/js/NonLinear/PROD_f.pickle
@@ -7,39 +7,39 @@ p2
 atp3
 Rp4
 .(dp0
-S'this.x'
+S'model.sim'
 p1
-S'double'
+S'vector'
 p2
-sS'model.sim'
+sS'model.in1'
 p3
-S'vector'
+S'matrix'
 p4
-sS'model.in1'
+sS'model.blocktype'
 p5
-S'matrix'
+S'string'
 p6
-sS'model.blocktype'
+sS'model.out'
 p7
-S'string'
+S'double'
 p8
-sS'model.out'
-p9
-g2
 sS'p'
+p9
+g8
+sS'model.dep_ut'
 p10
 g2
-sS'model.dep_ut'
-p11
-g4
 sS'y'
+p11
+g2
+sS'x'
 p12
-g4
+g8
 sS'model'
 p13
 S'object'
 p14
 sS'typ'
 p15
-g4
+g2
 s.
\ No newline at end of file
diff --git a/js/NonLinear/QUANT_f.pickle b/js/NonLinear/QUANT_f.pickle
index 0c1b1bdf..b4faee1b 100644
--- a/js/NonLinear/QUANT_f.pickle
+++ b/js/NonLinear/QUANT_f.pickle
@@ -11,67 +11,69 @@ p4
 atp5
 Rp6
 .(dp0
-S'this.x'
+S'model.sim'
 p1
-S'double'
+S'string'
 p2
-sS'model.sim'
+sS'model.in1'
 p3
-S'string'
+S'double'
 p4
-sS'model.in1'
+sS'pas'
 p5
-g2
+g4
 sS'model.blocktype'
 p6
-g4
-sS'this.meth'
-p7
 g2
-sS'this.x.graphics'
-p8
+sS'x.graphics'
+p7
 S'object'
-p9
+p8
 sS'arg1'
-p10
-g9
+p9
+g8
 sS'graphics.exprs'
-p11
+p10
 NsS'model.rpar'
+p11
+g4
+sS'rpar'
 p12
-NsS'rpar'
+NsS'exprs'
 p13
-NsS'this.x.model'
+S'matrix'
 p14
-NsS'exprs'
+sS'x.model'
 p15
-S'matrix'
+NsS'gr_i'
 p16
-sS'gr_i'
-p17
 S'vector'
-p18
+p17
 sS'model.dep_ut'
-p19
-g18
+p18
+g17
 sS'graphics'
-p20
-g9
+p19
+g8
 sS'y'
+p20
+g17
+sS'x'
 p21
-g18
+g4
 sS'model'
 p22
-g9
+g8
 sS'model.ipar'
 p23
-NsS'typ'
+g4
+sS'typ'
 p24
-g18
-sS'this.pas'
+g17
+sS'meth'
 p25
-g2
+g4
 sS'model.out'
 p26
-g2
+g4
 s.
\ No newline at end of file
diff --git a/js/NonLinear/SATURATION.pickle b/js/NonLinear/SATURATION.pickle
index 22a9da8c..4597f082 100644
--- a/js/NonLinear/SATURATION.pickle
+++ b/js/NonLinear/SATURATION.pickle
@@ -24,61 +24,61 @@ sS'rpar'
 p4
 S'matrix'
 p5
-sS'this.x.model'
+sS'model.out'
 p6
-NsS'model.out'
-p7
 S'double'
+p7
+sS'x.model'
 p8
-sS'model.in1'
+NsS'minp'
 p9
-g8
-sS'this.minp'
+g7
+sS'model.in1'
 p10
-g8
-sS'model.nzcross'
+g7
+sS'x.graphics'
 p11
-g8
-sS'this.x'
+g2
+sS'typ'
 p12
-g8
-sS'model.sim'
-p13
 S'vector'
+p13
+sS'maxp'
 p14
-sS'model.nmode'
+g7
+sS'model.sim'
 p15
-g8
-sS'model.rpar'
+g13
+sS'model.nmode'
 p16
+g7
+sS'model.rpar'
+p17
 g5
 sS'graphics.exprs'
-p17
-NsS'this.x.graphics'
 p18
-g2
-sS'model.blocktype'
+NsS'model.nzcross'
 p19
-S'string'
+g7
+sS'model.blocktype'
 p20
-sS'typ'
+S'string'
 p21
-g14
 sS'model.dep_ut'
 p22
-g14
+g13
 sS'exprs'
 p23
 g5
 sS'gr_i'
 p24
-g14
-sS'this.maxp'
-p25
-g8
+g13
 sS'y'
+p25
+g13
+sS'x'
 p26
-g14
+g7
 sS'model'
 p27
 g2
diff --git a/js/NonLinear/SAT_f.pickle b/js/NonLinear/SAT_f.pickle
index 746877ac..bfdf1e21 100644
--- a/js/NonLinear/SAT_f.pickle
+++ b/js/NonLinear/SAT_f.pickle
@@ -28,60 +28,60 @@ sS'rpar'
 p6
 S'matrix'
 p7
-sS'model.nzcross'
+sS'model.out'
 p8
 g2
-sS'this.x.model'
+sS'x.model'
 p9
-NsS'model.out'
+NsS'minp'
 p10
 g2
 sS'model.in1'
 p11
 g2
-sS'this.minp'
+sS'x.graphics'
 p12
-g2
-sS'this.maxp'
+g4
+sS'typ'
 p13
-g2
-sS'model.firing'
-p14
 S'vector'
+p14
+sS'maxp'
 p15
-sS'this.x'
-p16
 g2
+sS'model.firing'
+p16
+g14
 sS'model.sim'
 p17
-g15
+g14
 sS'model.rpar'
 p18
 g7
 sS'graphics.exprs'
 p19
-NsS'this.x.graphics'
+NsS'model.nzcross'
 p20
-g4
+g2
 sS'model.blocktype'
 p21
 S'string'
 p22
-sS'typ'
-p23
-g15
 sS'model.dep_ut'
-p24
-g15
+p23
+g14
 sS'exprs'
-p25
+p24
 g7
 sS'gr_i'
-p26
-g15
+p25
+g14
 sS'y'
+p26
+g14
+sS'x'
 p27
-g15
+g2
 sS'model'
 p28
 g4
diff --git a/js/NonLinear/SIGNUM.pickle b/js/NonLinear/SIGNUM.pickle
index f0f47537..835aded5 100644
--- a/js/NonLinear/SIGNUM.pickle
+++ b/js/NonLinear/SIGNUM.pickle
@@ -9,63 +9,63 @@ p3
 atp4
 Rp5
 .(dp0
-S'this.x'
+S'model.sim'
 p1
-S'double'
+S'vector'
 p2
-sS'model.sim'
+sS'model.in1'
 p3
-S'vector'
+S'double'
 p4
-sS'model.in1'
-p5
-g2
 sS'model.blocktype'
-p6
+p5
 S'string'
+p6
+sS'x.graphics'
 p7
-sS'this.x.model'
+S'object'
 p8
-NsS'this.x.graphics'
+sS'arg1'
 p9
-S'object'
+g8
+sS'graphics.exprs'
 p10
-sS'arg1'
+NsS'model.nmode'
 p11
-g10
-sS'graphics.exprs'
+g4
+sS'model.out'
 p12
-NsS'model.nmode'
+g4
+sS'model.nzcross'
 p13
-g2
-sS'model.out'
+g4
+sS'exprs'
 p14
 g2
-sS'model.nzcross'
+sS'x.model'
 p15
-g2
-sS'exprs'
+NsS'gr_i'
 p16
-g4
-sS'gr_i'
-p17
-g4
+g2
 sS'model.dep_ut'
-p18
-g4
+p17
+g2
 sS'graphics'
-p19
-g10
+p18
+g8
 sS'y'
+p19
+g2
+sS'x'
 p20
 g4
 sS'model'
 p21
-g10
+g8
 sS'typ'
 p22
-g4
+g2
 sS'nu'
 p23
-g2
+g4
 s.
\ No newline at end of file
diff --git a/js/NonLinear/SINBLK_f.pickle b/js/NonLinear/SINBLK_f.pickle
index 5385a9d6..a1899b57 100644
--- a/js/NonLinear/SINBLK_f.pickle
+++ b/js/NonLinear/SINBLK_f.pickle
@@ -7,41 +7,41 @@ p2
 atp3
 Rp4
 .(dp0
-S'this.x'
+S'model.sim'
 p1
-S'double'
+S'string'
 p2
-sS'model.sim'
+sS'model.in1'
 p3
-S'string'
+S'double'
 p4
-sS'model.in1'
+sS'model.blocktype'
 p5
 g2
-sS'model.blocktype'
-p6
-g4
 sS'exprs'
-p7
-g4
+p6
+g2
 sS'model.dep_ut'
-p8
+p7
 S'vector'
-p9
+p8
 sS'model.out'
-p10
-g2
+p9
+g4
 sS'gr_i'
-p11
-g9
+p10
+g8
 sS'y'
+p11
+g8
+sS'x'
 p12
-g9
+g4
 sS'model'
 p13
 S'object'
 p14
 sS'typ'
 p15
-g9
+g8
 s.
\ No newline at end of file
diff --git a/js/NonLinear/TANBLK_f.pickle b/js/NonLinear/TANBLK_f.pickle
index 83113602..b1fe08f9 100644
--- a/js/NonLinear/TANBLK_f.pickle
+++ b/js/NonLinear/TANBLK_f.pickle
@@ -7,47 +7,47 @@ p2
 atp3
 Rp4
 .(dp0
-S'this.x'
+S'model.sim'
 p1
-S'double'
+S'string'
 p2
-sS'model.sim'
+sS'model.in1'
 p3
-S'string'
+S'double'
 p4
-sS'model.in1'
+sS'model.blocktype'
 p5
 g2
-sS'this.x.model.firing'
+sS'x.model.firing'
 p6
 S'vector'
 p7
 sS'exprs'
 p8
-g2
+g4
 sS'in1'
 p9
-g2
+g4
 sS'model.dep_ut'
 p10
 g7
 sS'model.out'
 p11
-g2
+g4
 sS'gr_i'
 p12
 g7
 sS'y'
 p13
 g7
-sS'model'
+sS'x'
 p14
-S'object'
+g4
+sS'model'
 p15
-sS'typ'
+S'object'
 p16
-g7
-sS'model.blocktype'
+sS'typ'
 p17
-g4
+g7
 s.
\ No newline at end of file
diff --git a/js/NonLinear/TrigFun.pickle b/js/NonLinear/TrigFun.pickle
index f5c38a07..b9dda0a5 100644
--- a/js/NonLinear/TrigFun.pickle
+++ b/js/NonLinear/TrigFun.pickle
@@ -9,61 +9,61 @@ p3
 atp4
 Rp5
 .(dp0
-S'this.x'
+S'model.sim'
 p1
-S'double'
+S'vector'
 p2
-sS'model.sim'
+sS'model.in1'
 p3
-S'vector'
+S'double'
 p4
-sS'model.in1'
-p5
-g2
 sS'model.blocktype'
-p6
+p5
 S'string'
+p6
+sS'x.graphics'
 p7
-sS'this.x.graphics'
-p8
 S'object'
-p9
+p8
 sS'arg1'
-p10
-g9
+p9
+g8
 sS'graphics.exprs'
-p11
+p10
 NsS'PREVAR_FF'
-p12
+p11
 S'matrix'
-p13
+p12
 sS'PREVAR_GG'
+p13
+g12
+sS'exprs'
 p14
-g13
-sS'this.x.model'
+g6
+sS'x.model'
 p15
-NsS'exprs'
+NsS'gr_i'
 p16
-g7
-sS'gr_i'
-p17
-g4
+g2
 sS'model.dep_ut'
-p18
-g4
+p17
+g2
 sS'graphics'
-p19
-g9
+p18
+g8
 sS'y'
+p19
+g2
+sS'x'
 p20
 g4
 sS'model'
 p21
-g9
+g8
 sS'typ'
 p22
-g4
+g2
 sS'model.out'
 p23
-g2
+g4
 s.
\ No newline at end of file