40 files changed, 1401 insertions, 1477 deletions

diff --git a/js/Sources/CLKINV_f.pickle b/js/Sources/CLKINV_f.pickle
index 8c9907a4..a5c7dd04 100644
--- a/js/Sources/CLKINV_f.pickle
+++ b/js/Sources/CLKINV_f.pickle
@@ -27,47 +27,45 @@ g2
 sS'prt'
 p6
 g4
-sS'arg1'
-p7
-S'object'
-p8
 sS'graphics.exprs'
-p9
+p7
 g4
 sS'model.dep_ut'
-p10
+p8
 S'vector_boolean'
-p11
+p9
 sS'exprs'
-p12
+p10
 g2
 sS'x.model'
-p13
+p11
 NsS'gr_i'
-p14
+p12
 S'vector'
-p15
+p13
 sS'graphics'
-p16
-g8
+p14
+S'object'
+p15
 sS'y'
-p17
-g15
+p16
+g13
 sS'x'
+p17
+g13
+sS'model'
 p18
-NsS'model'
-p19
-g8
+g15
 sS'model.ipar'
-p20
+p19
 g4
 sS'typ'
+p20
+g13
+sS'x.graphics'
 p21
 g15
-sS'x.graphics'
-p22
-g8
 sS'model.firing'
-p23
+p22
 g4
 s.
\ No newline at end of file
diff --git a/js/Sources/CLKIN_f.pickle b/js/Sources/CLKIN_f.pickle
index 1c20c047..219b85c1 100644
--- a/js/Sources/CLKIN_f.pickle
+++ b/js/Sources/CLKIN_f.pickle
@@ -27,44 +27,42 @@ g2
 sS'prt'
 p6
 g4
-sS'arg1'
-p7
-S'object'
-p8
 sS'graphics.exprs'
-p9
+p7
 g4
 sS'model.dep_ut'
-p10
+p8
 S'vector_boolean'
-p11
+p9
 sS'exprs'
-p12
+p10
 g2
 sS'x.model'
-p13
+p11
 NsS'graphics'
-p14
-g8
+p12
+S'object'
+p13
 sS'y'
-p15
+p14
 S'vector'
-p16
+p15
 sS'x'
+p16
+g15
+sS'model'
 p17
-NsS'model'
-p18
-g8
+g13
 sS'model.ipar'
-p19
+p18
 g4
 sS'typ'
-p20
-g16
+p19
+g15
 sS'x.graphics'
-p21
-g8
+p20
+g13
 sS'model.firing'
-p22
+p21
 g4
 s.
\ No newline at end of file
diff --git a/js/Sources/CLOCK_c.js b/js/Sources/CLOCK_c.js
index c33cab71..cfb7477d 100644
--- a/js/Sources/CLOCK_c.js
+++ b/js/Sources/CLOCK_c.js
@@ -46,12 +46,15 @@ function CLOCK_c() {
         return this.x;
     }
     CLOCK_c.prototype.get = function CLOCK_c() {
+        for (i=1;i<=length(this.model.rpar.objs);i+=1) {
+            var o = this.model.rpar.objs[i-1];
             if (typeof(o)=="Block"&&o.gui=="EVTDLY_c") {
                 var path = i;
                 break;
             }
         }
         var newpar = list();
+        var xx = this.model.rpar.objs[path-1];
         var exprs = xx.graphics.exprs;
         this.model = xx.model;
         var t0_old = this.model.firing;
@@ -65,12 +68,15 @@ function CLOCK_c() {
         return options;
     }
     CLOCK_c.prototype.set = function CLOCK_c() {
+        for (i=1;i<=length(this.model.rpar.objs);i+=1) {
+            var o = this.model.rpar.objs[i-1];
             if (typeof(o)=="Block"&&o.gui=="EVTDLY_c") {
                 var path = i;
                 break;
             }
         }
         var newpar = list();
+        var xx = this.model.rpar.objs[path-1];
         var exprs = xx.graphics.exprs;
         this.model = xx.model;
         var t0_old = this.model.firing;
@@ -93,6 +99,7 @@ function CLOCK_c() {
                 this.model.rpar = new ScilabDouble([this.dt],[this.t0]);
                 this.model.firing = new ScilabDouble([this.t0]);
                 xx.model = this.model;
+                this.model.rpar.objs[path-1] = xx;
                 break;
             }
         }
diff --git a/js/Sources/CLOCK_c.pickle b/js/Sources/CLOCK_c.pickle
index 24f37441..f6f53c24 100644
--- a/js/Sources/CLOCK_c.pickle
+++ b/js/Sources/CLOCK_c.pickle
@@ -26,7 +26,7 @@ p4
 sS'xx.model'
 p5
 g2
-sS'arg1'
+sS'output_port'
 p6
 g2
 sS'output_port.graphics.flip'
@@ -43,72 +43,72 @@ g2
 sS'xx'
 p12
 g2
-sS'o'
+sS'evtdly.graphics.orig'
 p13
-g2
-sS'x.model.rpar'
+S'vector'
 p14
-S'double'
+sS'x.model.rpar'
 p15
-sS'x.model.evtout'
+S'double'
 p16
-g15
-sS'evtdly.graphics.pein'
+sS'x.model.evtout'
 p17
-g15
-sS'evtdly.graphics.sz'
+g16
+sS'evtdly.graphics.pein'
 p18
-S'vector'
+g16
+sS'evtdly.graphics.sz'
 p19
+g14
 sS'output_port.graphics.pein'
 p20
-g15
+g16
 sS't0_old'
 p21
 NsS'x.graphics.gr_i'
 p22
-g19
-sS'x.model.firing'
+g14
+sS'diagram.objs[4-1]'
 p23
+g2
+sS'x.model.firing'
+p24
 g8
 sS'output_port.model.ipar'
-p24
-g15
-sS'xx.graphics.exprs'
 p25
-NsS'x.model.blocktype'
+g16
+sS'xx.graphics.exprs'
 p26
+NsS'x.model.blocktype'
+p27
 g4
 sS'evtdly.model.rpar'
-p27
+p28
 g10
 sS'newpar[size(newpar)+1-1]'
-p28
-NsS'diagram.objs[6-1]'
 p29
-g15
-sS'split'
+NsS'diagram.objs[6-1]'
 p30
+g16
+sS'split'
+p31
 g2
 sS'diagram.objs[3-1]'
-p31
-g15
-sS'model.firing'
 p32
-NsS'diagram.objs[5-1]'
+g16
+sS'model.firing'
 p33
-g15
-sS'evtdly.graphics.flip'
+NsS'diagram.objs[5-1]'
 p34
-g8
-sS'output_port'
+g16
+sS'evtdly.graphics.flip'
 p35
-g2
+g8
 sS'newpar'
 p36
 S'list'
 p37
-sS'diagram.objs[4-1]'
+sS'model.rpar.objs[path-1]'
 p38
 g2
 sS'x.model.dep_ut'
@@ -126,16 +126,16 @@ p43
 g2
 sS'diagram'
 p44
-g15
+g16
 sS'dt_old'
 p45
-g15
+g16
 sS'output_port.graphics.sz'
 p46
-g19
+g14
 sS'x.graphics.peout'
 p47
-g15
+g16
 sS'path'
 p48
 NsS'evtdly.graphics.exprs'
@@ -149,58 +149,49 @@ p51
 g4
 sS'needcompile'
 p52
-g15
+g16
 sS'evtdly.graphics.peout'
 p53
-g15
-sS'arg1.model'
-p54
-g2
+g16
 sS'ok'
-p55
+p54
 g8
 sS'evtdly.model.firing'
-p56
-g15
+p55
+g16
 sS'diagram.objs[2-1]'
-p57
+p56
 g2
-sS'evtdly.graphics.orig'
-p58
-g19
 sS'x.gui'
-p59
+p57
 g4
-sS'arg1.model.rpar.objs[path-1]'
-p60
+sS'o'
+p58
 g2
 sS'x.graphics.sz'
-p61
-g19
+p59
+g14
 sS'exprs'
-p62
+p60
 NsS'gr_i'
-p63
-g19
+p61
+g14
 sS'output_port.graphics.orig'
-p64
-g19
+p62
+g14
 sS'y'
-p65
-g15
+p63
+g16
 sS'x'
-p66
-g15
+p64
+g16
 sS'model'
-p67
+p65
 g2
 sS'split.graphics.pein'
-p68
-g15
-sS'arg1.model.rpar'
-p69
-g2
+p66
+g16
 sS'split.graphics.orig'
-p70
+p67
 g10
 s.
\ No newline at end of file
diff --git a/js/Sources/CLOCK_f.js b/js/Sources/CLOCK_f.js
index 291cf09d..306da277 100644
--- a/js/Sources/CLOCK_f.js
+++ b/js/Sources/CLOCK_f.js
@@ -46,12 +46,15 @@ function CLOCK_f() {
         return this.x;
     }
     CLOCK_f.prototype.get = function CLOCK_f() {
+        for (i=1;i<=length(this.model.rpar.objs);i+=1) {
+            var o = this.model.rpar.objs[i-1];
             if (typeof(o)=="Block"&&o.gui=="EVTDLY_f") {
                 var path = i;
                 break;
             }
         }
         var newpar = list();
+        var xx = this.model.rpar.objs[path-1];
         var exprs = xx.graphics.exprs;
         this.model = xx.model;
         var t0_old = this.model.firing;
@@ -65,12 +68,15 @@ function CLOCK_f() {
         return options;
     }
     CLOCK_f.prototype.set = function CLOCK_f() {
+        for (i=1;i<=length(this.model.rpar.objs);i+=1) {
+            var o = this.model.rpar.objs[i-1];
             if (typeof(o)=="Block"&&o.gui=="EVTDLY_f") {
                 var path = i;
                 break;
             }
         }
         var newpar = list();
+        var xx = this.model.rpar.objs[path-1];
         var exprs = xx.graphics.exprs;
         this.model = xx.model;
         var t0_old = this.model.firing;
@@ -94,6 +100,7 @@ function CLOCK_f() {
                 this.model.rpar = new ScilabDouble([this.dt]);
                 this.model.firing = new ScilabDouble([this.t0]);
                 xx.model = this.model;
+                this.model.rpar.objs[path-1] = xx;
                 break;
             }
         }
diff --git a/js/Sources/CLOCK_f.pickle b/js/Sources/CLOCK_f.pickle
index 3d511cab..82a67ab7 100644
--- a/js/Sources/CLOCK_f.pickle
+++ b/js/Sources/CLOCK_f.pickle
@@ -26,7 +26,7 @@ p4
 sS'xx.model'
 p5
 g2
-sS'arg1'
+sS'output_port'
 p6
 g2
 sS'output_port.graphics.flip'
@@ -43,72 +43,72 @@ g2
 sS'xx'
 p12
 g2
-sS'o'
+sS'evtdly.graphics.orig'
 p13
-g2
-sS'x.model.rpar'
+S'vector'
 p14
-S'double'
+sS'x.model.rpar'
 p15
-sS'x.model.evtout'
+S'double'
 p16
-g15
-sS'evtdly.graphics.pein'
+sS'x.model.evtout'
 p17
-g15
-sS'evtdly.graphics.sz'
+g16
+sS'evtdly.graphics.pein'
 p18
-S'vector'
+g16
+sS'evtdly.graphics.sz'
 p19
+g14
 sS'output_port.graphics.pein'
 p20
-g15
+g16
 sS't0_old'
 p21
 NsS'x.graphics.gr_i'
 p22
-g19
-sS'x.model.firing'
+g14
+sS'diagram.objs[4-1]'
 p23
+g2
+sS'x.model.firing'
+p24
 g8
 sS'output_port.model.ipar'
-p24
-g15
-sS'xx.graphics.exprs'
 p25
-NsS'x.model.blocktype'
+g16
+sS'xx.graphics.exprs'
 p26
+NsS'x.model.blocktype'
+p27
 g4
 sS'evtdly.model.rpar'
-p27
-g15
-sS'newpar[size(newpar)+1-1]'
 p28
-NsS'diagram.objs[6-1]'
+g16
+sS'newpar[size(newpar)+1-1]'
 p29
-g15
-sS'split'
+NsS'diagram.objs[6-1]'
 p30
+g16
+sS'split'
+p31
 g2
 sS'diagram.objs[3-1]'
-p31
-g15
-sS'model.firing'
 p32
-NsS'diagram.objs[5-1]'
+g16
+sS'model.firing'
 p33
-g15
-sS'evtdly.graphics.flip'
+NsS'diagram.objs[5-1]'
 p34
-g8
-sS'output_port'
+g16
+sS'evtdly.graphics.flip'
 p35
-g2
+g8
 sS'newpar'
 p36
 S'list'
 p37
-sS'diagram.objs[4-1]'
+sS'model.rpar.objs[path-1]'
 p38
 g2
 sS'x.model.dep_ut'
@@ -125,15 +125,16 @@ p43
 g2
 sS'diagram'
 p44
-g15
+g16
 sS'dt_old'
 p45
-NsS'output_port.graphics.sz'
+g2
+sS'output_port.graphics.sz'
 p46
-g19
+g14
 sS'x.graphics.peout'
 p47
-g15
+g16
 sS'path'
 p48
 NsS'evtdly.graphics.exprs'
@@ -147,58 +148,49 @@ p51
 g4
 sS'needcompile'
 p52
-g15
+g16
 sS'evtdly.graphics.peout'
 p53
-g15
-sS'arg1.model'
-p54
-g2
+g16
 sS'ok'
-p55
+p54
 g8
 sS'evtdly.model.firing'
-p56
-g15
+p55
+g16
 sS'diagram.objs[2-1]'
-p57
+p56
 g2
-sS'evtdly.graphics.orig'
-p58
-g19
 sS'x.gui'
-p59
+p57
 g4
-sS'arg1.model.rpar.objs[path-1]'
-p60
+sS'o'
+p58
 g2
 sS'x.graphics.sz'
-p61
-g19
+p59
+g14
 sS'exprs'
-p62
+p60
 NsS'gr_i'
-p63
-g19
+p61
+g14
 sS'output_port.graphics.orig'
-p64
-g19
+p62
+g14
 sS'y'
-p65
-g15
+p63
+g16
 sS'x'
-p66
-g15
+p64
+g16
 sS'model'
-p67
+p65
 g2
 sS'split.graphics.pein'
-p68
-g15
-sS'arg1.model.rpar'
-p69
-g2
+p66
+g16
 sS'split.graphics.orig'
-p70
+p67
 g10
 s.
\ No newline at end of file
diff --git a/js/Sources/CONST.pickle b/js/Sources/CONST.pickle
index 859ab831..901db910 100644
--- a/js/Sources/CONST.pickle
+++ b/js/Sources/CONST.pickle
@@ -28,52 +28,50 @@ sS'x.graphics'
 p6
 S'object'
 p7
-sS'arg1'
-p8
-g7
 sS'graphics.exprs'
-p9
+p8
 NsS'C'
-p10
+p9
 g2
 sS'model.rpar'
-p11
+p10
 g2
 sS'exprs'
-p12
+p11
 g2
 sS'x.model'
-p13
+p12
 NsS'gr_i'
-p14
+p13
 S'vector'
-p15
+p14
 sS'model.dep_ut'
-p16
+p15
 S'vector_boolean'
-p17
+p16
 sS'model.in'
-p18
-g15
+p17
+g14
 sS'graphics'
-p19
+p18
 g7
 sS'y'
-p20
-g15
+p19
+g14
 sS'x'
+p20
+g14
+sS'model'
 p21
-NsS'model'
-p22
 g7
 sS'model.sim'
-p23
+p22
 S'list'
-p24
+p23
 sS'typ'
-p25
-g15
+p24
+g14
 sS'nout'
-p26
+p25
 g2
 s.
\ No newline at end of file
diff --git a/js/Sources/CONST_f.pickle b/js/Sources/CONST_f.pickle
index 3ed3282f..b8cd6c36 100644
--- a/js/Sources/CONST_f.pickle
+++ b/js/Sources/CONST_f.pickle
@@ -29,48 +29,46 @@ sS'x.graphics'
 p7
 S'object'
 p8
-sS'arg1'
-p9
-g8
 sS'graphics.exprs'
-p10
+p9
 NsS'C'
-p11
+p10
 g4
 sS'model.rpar'
-p12
+p11
 g4
 sS'exprs'
-p13
+p12
 g4
 sS'x.model'
-p14
+p13
 NsS'gr_i'
-p15
+p14
 S'vector'
-p16
+p15
 sS'model.dep_ut'
-p17
+p16
 S'vector_boolean'
-p18
+p17
 sS'model.in'
-p19
-g16
+p18
+g15
 sS'graphics'
-p20
+p19
 g8
 sS'y'
-p21
-g16
+p20
+g15
 sS'x'
+p21
+g15
+sS'model'
 p22
-NsS'model'
-p23
 g8
 sS'typ'
-p24
-g16
+p23
+g15
 sS'nout'
-p25
+p24
 g4
 s.
\ No newline at end of file
diff --git a/js/Sources/CONST_m.pickle b/js/Sources/CONST_m.pickle
index 0552c2a7..8df9c126 100644
--- a/js/Sources/CONST_m.pickle
+++ b/js/Sources/CONST_m.pickle
@@ -13,80 +13,78 @@ p5
 atp6
 Rp7
 .(dp0
-S'arg1'
+S'graphics'
 p1
 S'object'
 p2
-sS'graphics'
-p3
-g2
 sS'x.model'
-p4
+p3
 NsS'model.out'
-p5
+p4
 S'double'
-p6
+p5
 sS'model.in2'
-p7
+p6
 S'vector'
-p8
+p7
 sS'x.graphics'
-p9
+p8
 g2
 sS'model.sim'
-p10
+p9
 S'list'
-p11
+p10
 sS'C'
-p12
-g8
+p11
+g7
 sS'model.out2'
-p13
-g6
+p12
+g5
 sS'model.rpar'
-p14
-g8
+p13
+g7
 sS'model.in'
-p15
-g8
+p14
+g7
 sS'graphics.exprs'
-p16
+p15
 NsS'typ'
-p17
-g8
+p16
+g7
 sS'model.opar'
-p18
-g11
+p17
+g10
 sS'ok'
-p19
+p18
 S'boolean'
-p20
+p19
 sS'model.blocktype'
-p21
+p20
 S'string'
-p22
+p21
 sS'model.dep_ut'
-p23
+p22
 S'vector_boolean'
-p24
+p23
 sS'exprs'
-p25
-g22
+p24
+g21
 sS'gr_i'
-p26
-g8
+p25
+g7
 sS'y'
-p27
-g8
+p26
+g7
 sS'x'
+p27
+g7
+sS'model'
 p28
-NsS'model'
-p29
 g2
 sS'ot'
-p30
-g6
+p29
+g5
 sS'nout'
-p31
-g6
+p30
+g5
 s.
\ No newline at end of file
diff --git a/js/Sources/CURVE_c.pickle b/js/Sources/CURVE_c.pickle
index f95c8324..81bc2b7a 100644
--- a/js/Sources/CURVE_c.pickle
+++ b/js/Sources/CURVE_c.pickle
@@ -320,535 +320,532 @@ g4
 sS'x11'
 p74
 g4
-sS'arg1'
-p75
-S'object'
-p76
 sS'Pd3'
-p77
+p75
 g2
 sS't3'
-p78
+p76
 g4
 sS'ey'
-p79
+p77
 g7
 sS'ex'
-p80
+p78
 g7
 sS'zz'
-p81
+p79
 g7
 sS'sAmp'
-p82
+p80
 g2
 sS'a.children[2-1]'
-p83
-g76
+p81
+S'object'
+p82
 sS'Sawt1_exprs'
-p84
+p83
 NsS'a.title.font_style'
-p85
+p84
 g7
 sS'y2'
-p86
+p85
 g4
 sS'orpar'
-p87
+p86
 g2
 sS'x.graphics'
-p88
-g76
+p87
+g82
 sS'menu_d'
-p89
+p88
 g19
 sS'menu_e'
-p90
+p89
 g19
 sS'ye[$+1-1]'
-p91
+p90
 g7
 sS'A[j+1-1][i+N-1]'
-p92
+p91
 g7
 sS'a.children[1-1]'
-p93
-g76
+p92
+g82
 sS'y1p'
-p94
+p93
 g7
 sS'r'
-p95
+p94
 g4
 sS'seed4'
-p96
+p95
 g2
 sS'seed5'
-p97
+p96
 g2
 sS'B[j+1-1]'
-p98
+p97
 g7
 sS'model.evtin'
-p99
+p98
 g7
 sS'y21'
-p100
+p99
 g4
 sS'menu_t'
-p101
+p100
 g19
 sS'menu_r'
-p102
+p101
 g2
 sS'PO'
-p103
+p102
 g7
 sS'x22'
-p104
+p103
 g4
 sS'C'
-p105
+p104
 g2
 sS'DChange'
-p106
+p105
 g11
 sS'Cformat'
-p107
+p106
 g4
 sS'Q[i+N-1][i-1]'
-p108
+p107
 g7
 sS'rep'
-p109
+p108
 g7
 sS'ymx1'
-p110
+p109
 g7
 sS'xy[N-1][2-1]'
-p111
+p110
 g7
 sS'ipar[3-1]'
-p112
+p111
 g7
 sS'sTp'
-p113
+p112
 g2
 sS'wp'
-p114
+p113
 g2
 sS'New_methhod'
-p115
+p114
 g7
 sS'PeridicOption'
-p116
+p115
 g7
 sS'Graf'
-p117
+p116
 g4
 sS'Q'
-p118
+p117
 g7
 sS'ok'
-p119
+p118
 g11
 sS'ly11'
-p120
+p119
 g7
 sS'xy[k-1].slice()'
-p121
+p120
 g2
 sS'Z'
-p122
+p121
 g2
 sS'Cmenu'
-p123
+p122
 g4
 sS'periodicoption'
-p124
+p123
 g7
 sS'w'
-p125
+p124
 g4
 sS'a.x_ticks'
-p126
-g76
+p125
+g82
 sS'y2p'
-p127
+p126
 g7
 sS'A[j+1-1][i+2*N-1]'
-p128
+p127
 g7
 sS'YMN'
-p129
+p128
 g7
 sS'Q[i-1][i+N-1]'
-p130
+p129
 g7
 sS'y11'
-p131
+p130
 g4
 sS'x2p'
-p132
+p131
 g7
 sS'y12'
-p133
+p132
 g4
 sS'NC'
-p134
+p133
 g7
 sS'xyt'
-p135
+p134
 g2
 sS'xo'
-p136
+p135
 g27
 sS'ipar[2-1]'
-p137
+p136
 g7
 sS'xc'
-p138
+p137
 g7
 sS'sok'
-p139
+p138
 g11
 sS'offset'
-p140
+p139
 g2
 sS'splines.data'
-p141
+p140
 g2
 sS'perop'
-p142
+p141
 g4
 sS'xe'
-p143
+p142
 g7
 sS'Y'
-p144
+p143
 g7
 sS'xx'
-p145
+p144
 g2
 sS'xy'
-p146
+p145
 g2
 sS'btn'
-p147
+p146
 g7
 sS'xye'
-p148
+p147
 g2
 sS'xe[$+1-1]'
-p149
+p148
 g7
 sS'SaveExit'
-p150
+p149
 g11
 sS'xp'
-p151
+p150
 g7
 sS'Method'
-p152
+p151
 g7
 sS'xt'
-p153
+p152
 g27
 sS'xyo'
-p154
+p153
 g2
 sS'Q[i-1][i-1]'
-p155
+p154
 g7
 sS'ystR'
-p156
+p155
 g7
 sS'A[j-1][i+2*N-1]'
-p157
+p156
 g7
 sS'random_u_exprs2'
-p158
+p157
 g32
 sS'px'
-p159
+p158
 g7
 sS'py'
-p160
+p159
 g7
 sS'tok'
-p161
+p160
 g11
 sS'ixy'
-p162
+p161
 g2
 sS'rect'
-p163
+p162
 g27
 sS'NP'
-p164
+p163
 g7
 sS'Amp'
-p165
+p164
 g2
 sS'exprs[2-1]'
-p166
+p165
 g7
 sS'model.firing'
-p167
+p166
 g7
 sS'xy2'
-p168
+p167
 g2
 sS'B'
-p169
+p168
 g7
 sS'A'
-p170
+p169
 g7
 sS'yenC'
-p171
+p170
 g4
 sS'N'
-p172
+p171
 g7
 sS'random_u_exprs'
-p173
+p172
 g32
 sS'Sawt2_exprs'
-p174
+p173
 NsS'XMX'
-p175
+p174
 g7
 sS'model.in'
-p176
+p175
 g2
 sS'graphics'
-p177
-g76
+p176
+g82
 sS'Exitm'
-p178
+p177
 g4
 sS'N2'
-p179
+p178
 g7
 sS'model.ipar'
-p180
+p179
 g27
 sS'Pw3'
-p181
+p180
 g2
 sS'f'
-p182
+p181
 g7
 sS'a.grid'
-p183
+p182
 g2
 sS'y[N-1]'
-p184
+p183
 g7
 sS'xy[zz-1].slice()'
-p185
+p184
 g2
 sS'gr_i'
-p186
+p185
 g2
 sS'ipar'
-p187
+p186
 g2
 sS'ystC'
-p188
+p187
 g4
 sS'mtd'
-p189
+p188
 g7
 sS'PERIODIC'
-p190
+p189
 g4
 sS'xmx1'
-p191
+p190
 g7
 sS'scam'
-p192
+p191
 g4
 sS'exprs[4-1]'
-p193
+p192
 g4
 sS'ans0'
-p194
+p193
 g4
 sS'ymn1'
-p195
+p194
 g7
 sS't1'
-p196
+p195
 g4
 sS'model.evtout'
-p197
+p196
 g7
 sS'rpar'
-p198
+p197
 g2
 sS'lx11'
-p199
+p198
 g7
 sS'model.out'
-p200
+p199
 g7
 sS'Bias3'
-p201
+p200
 g2
 sS'Tp3'
-p202
+p201
 g2
 sS'np5'
-p203
+p202
 g2
 sS'np4'
-p204
+p203
 g2
 sS'rectx'
-p205
+p204
 g7
 sS'np1'
-p206
+p205
 g7
 sS'Lx'
-p207
+p206
 g7
 sS'x21'
-p208
+p207
 g4
 sS'x[k-1]'
-p209
+p208
 g2
 sS'HIT'
-p210
+p209
 g11
 sS'xstR'
-p211
+p210
 g7
 sS'xe[zz-1]'
-p212
+p211
 g2
 sS'A[j+1-1][i-1]'
-p213
+p212
 g7
 sS'sAmp2'
-p214
+p213
 g2
 sS'TN'
-p215
+p214
 g19
 sS'menus'
-p216
+p215
 g32
 sS'sdelay'
-p217
+p216
 g2
 sS'points'
-p218
+p217
 NsS'Q[i+N-1][i+N-1]'
-p219
+p218
 g7
 sS'TA'
-p220
+p219
 g27
 sS'Datam'
-p221
+p220
 g4
 sS'model.sim'
-p222
+p221
 g32
 sS'XMN'
-p223
+p222
 g7
 sS'A[j+2-1][i+N+1-1]'
-p224
+p223
 g7
 sS'a.data_bounds'
-p225
+p224
 g7
 sS'menu_o'
-p226
+p225
 g19
 sS'd'
-p227
+p226
 g7
 sS'ye'
-p228
+p227
 g7
 sS'X'
-p229
+p228
 g27
 sS'Zt'
-p230
+p229
 g27
 sS'fd'
-p231
+p230
 g7
 sS'exprs[5-1]'
-p232
+p231
 g4
 sS'graphics.exprs'
-p233
+p232
 NsS'phase'
-p234
+p233
 g7
 sS'ZERO_POINT'
-p235
+p234
 g11
 sS'typ'
-p236
+p235
 g2
 sS'min5'
-p237
+p236
 g2
 sS'a'
-p238
-g76
+p237
+g82
 sS'mok'
-p239
+p238
 g11
 sS'Orderm'
-p240
+p239
 g4
 sS'A[j+2-1][i+N-1]'
-p241
+p240
 g7
 sS'B[j-1]'
-p242
+p241
 g7
 sS'ly21'
-p243
+p242
 g7
 sS'y[zz-1]'
-p244
+p243
 g2
 sS'A[j+2-1][i-1]'
-p245
+p244
 g7
 sS'max5'
-p246
+p245
 g2
 sS'exprs'
-p247
+p246
 g27
 sS'exprs[3-1]'
-p248
+p247
 g7
 sS'y[k-1]'
-p249
+p248
 g2
 sS'At'
-p250
+p249
 g27
 sS'y'
-p251
+p250
 g7
 sS'model'
-p252
-g76
+p251
+g82
 sS'order'
-p253
+p252
 g7
 s.
\ No newline at end of file
diff --git a/js/Sources/CURV_f.pickle b/js/Sources/CURV_f.pickle
index 28f07de4..1f222784 100644
--- a/js/Sources/CURV_f.pickle
+++ b/js/Sources/CURV_f.pickle
@@ -11,87 +11,83 @@ p4
 atp5
 Rp6
 .(dp0
-S'arg1'
+S'rpar'
 p1
-S'object'
+S'matrix'
 p2
-sS'rpar'
+sS'x.model'
 p3
-S'matrix'
+S'object'
 p4
-sS'x.model'
-p5
-g2
 sS'gc'
-p6
+p5
 S'list'
-p7
+p6
 sS'model.out'
-p8
+p7
 S'double'
-p9
+p8
 sS'x.graphics'
-p10
+p9
 NsS'model.firing'
-p11
+p10
 S'vector'
-p12
+p11
 sS'model.sim'
-p13
+p12
 S'string'
-p14
+p13
 sS'axisdata'
-p15
-g4
+p14
+g2
 sS'model.rpar'
-p16
-g4
+p15
+g2
 sS'yy'
-p17
-g4
+p16
+g2
 sS'model.in'
+p17
+g11
+sS'model.ipar'
 p18
-g12
-sS'graphics'
+g2
+sS'typ'
 p19
-NsS'model.ipar'
+g11
+sS'rect'
 p20
-g4
-sS'typ'
+g11
+sS'ok'
 p21
-g12
-sS'rect'
+S'boolean'
 p22
-g12
-sS'ok'
+sS'model.blocktype'
 p23
-S'boolean'
+g13
+sS'xx'
 p24
-sS'model.blocktype'
+g2
+sS'model.dep_ut'
 p25
-g14
-sS'xx'
+S'vector_boolean'
 p26
-g4
-sS'model.dep_ut'
+sS'n'
 p27
-S'vector_boolean'
+g8
+sS'gr_i'
 p28
-sS'n'
+g11
+sS'ipar'
 p29
-g9
-sS'gr_i'
+g2
+sS'y'
 p30
-g12
-sS'ipar'
+g11
+sS'x'
 p31
-g4
-sS'y'
+g11
+sS'model'
 p32
-g12
-sS'x'
-p33
-NsS'model'
-p34
-g2
+g4
 s.
\ No newline at end of file
diff --git a/js/Sources/Counter.pickle b/js/Sources/Counter.pickle
index ef83c392..ccac941d 100644
--- a/js/Sources/Counter.pickle
+++ b/js/Sources/Counter.pickle
@@ -17,74 +17,72 @@ p7
 atp8
 Rp9
 .(dp0
-S'model.dstate'
+S'model.sim'
 p1
-S'double'
+S'list'
 p2
-sS'arg1'
+sS'model.out'
 p3
-S'object'
+S'double'
 p4
-sS'graphics'
+sS'model.out2'
 p5
 g4
-sS'maxim'
+sS'model.dstate'
 p6
-g2
-sS'x.model'
+g4
+sS'model.evtin'
 p7
-NsS'model.dep_ut'
+g4
+sS'minim'
 p8
-S'vector_boolean'
+g4
+sS'graphics.exprs'
 p9
-sS'model.out'
+NsS'maxim'
 p10
-g2
-sS'minim'
+g4
+sS'rule'
 p11
-g2
-sS'model.evtin'
+g4
+sS'exprs'
 p12
-g2
-sS'model.sim'
+S'matrix'
 p13
-S'list'
+sS'x.model'
 p14
-sS'model.out2'
+NsS'gr_i'
 p15
-g2
-sS'graphics.exprs'
+S'vector'
 p16
-NsS'model.ipar'
+sS'model.dep_ut'
 p17
-S'matrix'
+S'vector_boolean'
 p18
-sS'typ'
+sS'graphics'
 p19
-S'vector'
+S'object'
 p20
-sS'model.blocktype'
+sS'y'
 p21
-S'string'
+g16
+sS'x'
 p22
-sS'x.graphics'
+g16
+sS'model'
 p23
-g4
-sS'rule'
+g20
+sS'model.ipar'
 p24
-g2
-sS'exprs'
+g13
+sS'typ'
 p25
-g18
-sS'gr_i'
+g16
+sS'x.graphics'
 p26
 g20
-sS'y'
+sS'model.blocktype'
 p27
-g20
-sS'x'
+S'string'
 p28
-NsS'model'
-p29
-g4
 s.
\ No newline at end of file
diff --git a/js/Sources/FROMWSB.js b/js/Sources/FROMWSB.js
index a3ffd864..bc33c12c 100644
--- a/js/Sources/FROMWSB.js
+++ b/js/Sources/FROMWSB.js
@@ -18,6 +18,8 @@ function FROMWSB() {
         alert("parameters cannot be modified");
     }
     FROMWSB.prototype.set = function FROMWSB() {
+        for (i=1;i<=length(this.model.rpar.objs);i+=1) {
+            var o = this.model.rpar.objs[i-1];
             if (typeof(o)=="Block"&&o.gui=="FROMWS_c") {
                 var ppath = list(i);
                 break;
@@ -34,6 +36,7 @@ function FROMWSB() {
                 spath[$+1-1] = "objs";
                 spath[$+1-1] = path[k-1];
             }
+            var xx = getObjectFromKeyList(this, spath);
             execstr("xxn="+xx.gui+"(\'set\',xx)");
             if (!isequalbitwise(this.xxn,xx)) {
                 this.model = xx.model;
@@ -75,6 +78,7 @@ function FROMWSB() {
                         var needcompile = 4;
                     }
                 }
+                getObjectFromKeyList(this, spath) = this.xxn;
                 newpar[size(newpar)+1-1] = path;
                 var y = max(y,needcompile);
             }
diff --git a/js/Sources/FROMWSB.pickle b/js/Sources/FROMWSB.pickle
index 752ae120..6029ab62 100644
--- a/js/Sources/FROMWSB.pickle
+++ b/js/Sources/FROMWSB.pickle
@@ -17,87 +17,78 @@ S'ppath'
 p1
 S'list'
 p2
-sS'arg1'
+sS'scs_m_1.objs[3-1]'
 p3
-S'object'
+S'double'
 p4
-sS'scs_m_1.objs[3-1]'
+sS'xx'
 p5
-S'double'
+S'object'
 p6
-sS'xx'
+sS'spath[$+1-1]'
 p7
 g4
-sS'spath[$+1-1]'
+sS'eq'
 p8
 g6
-sS'eq'
-p9
-g4
 sS'newpar[size(newpar)+1-1]'
-p10
+p9
 NsS'scs_m_1'
+p10
+g4
+sS'eqn'
 p11
 g6
-sS'eqn'
+sS'np'
 p12
 g4
-sS'np'
-p13
-g6
 sS'scs_m_1.objs[2-1]'
-p14
-g6
+p13
+g4
 sS'spath'
-p15
+p14
 g2
 sS'newpar'
-p16
+p15
 g2
+sS'model.rpar'
+p16
+g6
 sS'model_n'
 p17
-g4
-sS'arg1[spath-1]'
+g6
+sS'scs_m_1.objs[4-1]'
 p18
 g4
-sS'scs_m_1.objs[4-1]'
-p19
-g6
 sS'typ'
-p20
+p19
 g2
 sS'xxn'
+p20
+g6
+sS'needcompile'
 p21
 g4
-sS'needcompile'
+sS'scs_m_1.objs[1-1]'
 p22
-g6
-sS'arg1.model'
+g4
+sS'modified'
 p23
 g4
-sS'scs_m_1.objs[1-1]'
+sS'o'
 p24
 g6
-sS'modified'
+sS'gr_i'
 p25
-g6
-sS'o'
+S'vector'
 p26
-g4
-sS'gr_i'
+sS'y'
 p27
-S'vector'
+g4
+sS'x'
 p28
-sS'y'
+g26
+sS'model'
 p29
 g6
-sS'x'
-p30
-g4
-sS'model'
-p31
-g4
-sS'arg1.model.rpar'
-p32
-g4
 s.
\ No newline at end of file
diff --git a/js/Sources/FROMWS_c.pickle b/js/Sources/FROMWS_c.pickle
index 11118752..452db98a 100644
--- a/js/Sources/FROMWS_c.pickle
+++ b/js/Sources/FROMWS_c.pickle
@@ -21,93 +21,91 @@ p9
 atp10
 Rp11
 .(dp0
-S'arg1'
+S'graphics'
 p1
 S'object'
 p2
-sS'graphics'
-p3
-g2
 sS'ierr'
-p4
+p3
 S'double'
-p5
+p4
 sS'x.model'
-p6
+p5
 NsS'OutEnd'
-p7
-g5
+p6
+g4
 sS'model.out'
-p8
-g5
+p7
+g4
 sS'Method'
-p9
-g5
+p8
+g4
 sS'varnam'
-p10
+p9
 S'string'
-p11
+p10
 sS'x.graphics'
-p12
+p11
 g2
 sS'gr_i'
-p13
+p12
 S'vector'
-p14
+p13
 sS'model.evtin'
-p15
-g14
+p14
+g13
 sS'model.firing'
-p16
-g14
+p15
+g13
 sS'model.sim'
-p17
+p16
 S'list'
-p18
+p17
 sS'model.evtout'
-p19
-g14
+p18
+g13
 sS'model.out2'
-p20
-g5
+p19
+g4
 sS'ZC'
-p21
-g5
+p20
+g4
 sS'y'
-p22
-g14
+p21
+g13
 sS'graphics.exprs'
-p23
+p22
 NsS'model.ipar'
-p24
+p23
 S'matrix'
-p25
+p24
 sS'typ'
-p26
-g14
+p25
+g13
 sS'ok'
-p27
+p26
 S'boolean'
-p28
+p27
 sS'model.blocktype'
-p29
-g11
+p28
+g10
 sS'model.dep_ut'
-p30
+p29
 S'vector_boolean'
-p31
+p30
 sS'exprs'
-p32
-g25
+p31
+g24
 sS'r'
-p33
-g28
+p32
+g27
 sS'model.outtyp'
-p34
-g5
+p33
+g4
 sS'x'
+p34
+g13
+sS'model'
 p35
-NsS'model'
-p36
 g2
 s.
\ No newline at end of file
diff --git a/js/Sources/GENSIN_f.pickle b/js/Sources/GENSIN_f.pickle
index c5cc3a29..f5c696b0 100644
--- a/js/Sources/GENSIN_f.pickle
+++ b/js/Sources/GENSIN_f.pickle
@@ -37,51 +37,49 @@ sS'x.graphics'
 p9
 S'object'
 p10
-sS'arg1'
-p11
-g10
 sS'model.out2'
-p12
+p11
 g4
 sS'model.rpar'
-p13
+p12
 S'matrix'
-p14
+p13
 sS'rpar'
-p15
-g14
+p14
+g13
 sS'exprs'
-p16
-g14
+p15
+g13
 sS'x.model'
-p17
+p16
 NsS'gr_i'
-p18
+p17
 g8
 sS'model.dep_ut'
-p19
+p18
 S'vector_boolean'
-p20
+p19
 sS'graphics.exprs'
-p21
+p20
 NsS'graphics'
-p22
+p21
 g10
 sS'y'
-p23
+p22
 g8
 sS'x'
+p23
+g8
+sS'model'
 p24
-NsS'model'
-p25
 g10
 sS'typ'
-p26
+p25
 g8
 sS'model.outtyp'
-p27
+p26
 g4
 sS'model.blocktype'
-p28
+p27
 g2
 s.
\ No newline at end of file
diff --git a/js/Sources/GENSQR_f.pickle b/js/Sources/GENSQR_f.pickle
index f65a822d..720c3109 100644
--- a/js/Sources/GENSQR_f.pickle
+++ b/js/Sources/GENSQR_f.pickle
@@ -34,46 +34,44 @@ sS'x.graphics'
 p8
 S'object'
 p9
-sS'arg1'
+sS'graphics'
 p10
 g9
-sS'graphics.exprs'
-p11
-g4
 sS'model.dep_ut'
-p12
+p11
 S'vector_boolean'
-p13
+p12
 sS'exprs'
-p14
+p13
 g2
 sS'x.model'
-p15
+p14
 NsS'gr_i'
-p16
+p15
 S'vector'
-p17
+p16
 sS'Amplitude'
+p17
+g4
+sS'graphics.exprs'
 p18
 g4
-sS'graphics'
-p19
-g9
 sS'y'
-p20
-g17
+p19
+g16
 sS'x'
+p20
+g16
+sS'model'
 p21
-NsS'model'
-p22
 g9
 sS'typ'
-p23
-g17
+p22
+g16
 sS'model.outtyp'
-p24
+p23
 g4
 sS'model.blocktype'
-p25
+p24
 g2
 s.
\ No newline at end of file
diff --git a/js/Sources/GEN_SQR.js b/js/Sources/GEN_SQR.js
index 7e21ad95..dc127a54 100644
--- a/js/Sources/GEN_SQR.js
+++ b/js/Sources/GEN_SQR.js
@@ -55,6 +55,7 @@ function GEN_SQR() {
     }
     GEN_SQR.prototype.get = function GEN_SQR() {
         var y = this.needcompile;
+        this.model.ipar = 1;
         var typ = list();
         var exprs = this.graphics.exprs;
         this.Btitre = "Set GEN_SQR parameters";
@@ -74,6 +75,7 @@ function GEN_SQR() {
     }
     GEN_SQR.prototype.set = function GEN_SQR() {
         var y = this.needcompile;
+        this.model.ipar = 1;
         var typ = list();
         var exprs = this.graphics.exprs;
         this.Btitre = "Set GEN_SQR parameters";
diff --git a/js/Sources/GEN_SQR.pickle b/js/Sources/GEN_SQR.pickle
index 045c12de..5a1c30aa 100644
--- a/js/Sources/GEN_SQR.pickle
+++ b/js/Sources/GEN_SQR.pickle
@@ -27,196 +27,190 @@ sS'scs_m_1.objs[14-1]'
 p3
 S'double'
 p4
-sS'arg1.model.ipar'
+sS'scs_m_1.objs[9-1]'
 p5
 g4
 sS'model.dstate'
 p6
 S'vector'
 p7
-sS'arg1'
-p8
-S'object'
-p9
 sS'scs_m_1.objs[6-1]'
-p10
+p8
 g4
 sS'scs_m_1.objs[5-1]'
-p11
+p9
 g4
 sS'scs_m_1.objs[3-1]'
-p12
+p10
 g4
 sS'scicos_context'
-p13
+p11
 g4
 sS'model.out'
-p14
+p12
 g4
 sS'x.model'
+p13
+S'object'
+p14
+sS'Amin'
 p15
-g9
-sS'scs_m_1.objs[9-1]'
-p16
 g4
 sS'rule'
-p17
+p16
 g4
 sS'x.model.rpar'
-p18
-g9
+p17
+g14
 sS'Btitre'
-p19
+p18
 S'string'
-p20
+p19
 sS'scs_m_1.objs[16-1]'
-p21
-g4
-sS'Amin'
-p22
+p20
 g4
 sS'scs_m_1.objs[11-1]'
-p23
+p21
 g4
 sS'model.in2'
-p24
+p22
 g7
 sS'model.intyp'
-p25
+p23
 g4
 sS'model.nzcross'
-p26
+p24
 g4
 sS'model.opar'
-p27
+p25
 g2
 sS'scs_m_1.objs[12-1]'
-p28
+p26
 g4
 sS'scs_m_1.objs[15-1]'
-p29
+p27
 g4
 sS'gr_i'
-p30
+p28
 g7
 sS'scs_m_1'
-p31
+p29
 g4
 sS'scs_m_1.objs[13-1]'
-p32
+p30
 g4
 sS'model.evtin'
-p33
+p31
 g7
 sS'Amax'
-p34
+p32
 g4
 sS'scs_m_1.objs[2-1]'
-p35
+p33
 g4
 sS'model.label'
-p36
-g20
+p34
+g19
 sS'model.sim'
-p37
-g20
+p35
+g19
 sS'model.evtout'
-p38
+p36
 g7
 sS'model.equations'
-p39
+p37
 g2
 sS'scs_m_1.objs[8-1]'
-p40
+p38
 g4
 sS'scs_m_1.objs[10-1]'
-p41
+p39
 g4
 sS'F'
-p42
+p40
 g4
 sS'Ss'
-p43
+p41
 g2
 sS'Exprs0'
-p44
+p42
 S'matrix'
-p45
+p43
 sS'model.out2'
-p46
+p44
 g4
 sS'sblock'
-p47
-g9
+p45
+g14
 sS'model.nmode'
-p48
+p46
 g4
 sS'model.rpar'
-p49
+p47
 g4
 sS'scs_m_1.objs[4-1]'
-p50
+p48
 g4
 sS'sblock.props'
-p51
-g9
+p49
+g14
 sS'model.in'
-p52
+p50
 g7
 sS'graphics'
-p53
-g9
+p51
+g14
 sS'scs_m_1.objs[7-1]'
-p54
+p52
 g4
 sS'model.ipar'
-p55
+p53
 g4
 sS'typ'
-p56
+p54
 g2
 sS'model.outtyp'
-p57
+p55
 g4
 sS'Bitems'
-p58
-g45
+p56
+g43
 sS'ok'
-p59
+p57
 S'boolean'
-p60
+p58
 sS'model.blocktype'
-p61
-g20
+p59
+g19
 sS'scs_m_1.objs[1-1]'
-p62
+p60
 g4
 sS'model.dep_ut'
-p63
+p61
 S'vector_boolean'
-p64
+p62
 sS'exprs'
-p65
+p63
 S'vector_string'
-p66
+p64
 sS'x.graphics.exprs'
-p67
+p65
 NsS'PREVAR_scicos_context'
-p68
+p66
 g4
 sS'model.firing'
-p69
+p67
 g7
 sS'y'
-p70
+p68
 g4
 sS'x'
-p71
-g9
+p69
+g14
 sS'model'
-p72
-g9
+p70
+g14
 sS'model.state'
-p73
+p71
 g7
 s.
\ No newline at end of file
diff --git a/js/Sources/Ground_g.pickle b/js/Sources/Ground_g.pickle
index 4c376fca..88444144 100644
--- a/js/Sources/Ground_g.pickle
+++ b/js/Sources/Ground_g.pickle
@@ -57,7 +57,8 @@ p18
 g4
 sS'x'
 p19
-NsS'model'
+g4
+sS'model'
 p20
 S'object'
 p21
diff --git a/js/Sources/INIMPL_f.pickle b/js/Sources/INIMPL_f.pickle
index ea56a6a9..399db5ce 100644
--- a/js/Sources/INIMPL_f.pickle
+++ b/js/Sources/INIMPL_f.pickle
@@ -13,81 +13,79 @@ p5
 atp6
 Rp7
 .(dp0
-S'arg1'
+S'graphics'
 p1
 S'object'
 p2
-sS'graphics'
-p3
-g2
 sS'mo.model'
-p4
+p3
 S'string'
-p5
+p4
 sS'prt'
-p6
+p5
 S'double'
-p7
+p6
 sS'x.model'
-p8
+p7
 g2
 sS'model.out'
-p9
+p8
 S'vector'
-p10
+p9
 sS'x.graphics'
-p11
+p10
 g2
 sS'model.sim'
-p12
-g5
+p11
+g4
 sS'model.equations'
-p13
-g7
+p12
+g6
 sS'mo.outputs'
-p14
-g5
+p13
+g4
 sS'model.out2'
-p15
-g10
+p14
+g9
 sS'x.graphics.out_implicit'
-p16
+p15
 S'vector_string'
-p17
+p16
 sS'graphics.exprs'
-p18
-g7
+p17
+g6
 sS'model.ipar'
-p19
-g10
+p18
+g9
 sS'typ'
-p20
-g10
+p19
+g9
 sS'needcompile'
-p21
-g7
+p20
+g6
 sS'model.blocktype'
-p22
-g5
+p21
+g4
 sS'mo'
-p23
-g7
+p22
+g6
 sS'model.dep_ut'
-p24
+p23
 S'vector_boolean'
-p25
+p24
 sS'exprs'
-p26
-g5
+p25
+g4
 sS'gr_i'
-p27
-g10
+p26
+g9
 sS'y'
-p28
-g7
+p27
+g6
 sS'x'
+p28
+g9
+sS'model'
 p29
-NsS'model'
-p30
 g2
 s.
\ No newline at end of file
diff --git a/js/Sources/IN_f.pickle b/js/Sources/IN_f.pickle
index 367948fd..e3b32726 100644
--- a/js/Sources/IN_f.pickle
+++ b/js/Sources/IN_f.pickle
@@ -28,55 +28,53 @@ g4
 sS'prt'
 p7
 g2
-sS'arg1'
-p8
-S'object'
-p9
 sS'model.out2'
-p10
+p8
 g2
 sS'x.graphics'
-p11
-g9
+p9
+S'object'
+p10
 sS'exprs'
-p12
+p11
 g4
 sS'x.model'
-p13
-g9
+p12
+g10
 sS'gr_i'
-p14
+p13
 S'vector'
-p15
+p14
 sS'model.dep_ut'
-p16
+p15
 S'vector_boolean'
-p17
+p16
 sS'graphics.exprs'
-p18
+p17
 S'matrix'
-p19
+p18
 sS'graphics'
-p20
-g9
+p19
+g10
 sS'y'
-p21
+p20
 g2
 sS'x'
+p21
+g14
+sS'model'
 p22
-NsS'model'
-p23
-g9
+g10
 sS'model.ipar'
-p24
+p23
 g2
 sS'typ'
-p25
-g15
+p24
+g14
 sS'model.outtyp'
-p26
+p25
 g2
 sS'model.firing'
-p27
-g15
+p26
+g14
 s.
\ No newline at end of file
diff --git a/js/Sources/Modulo_Count.pickle b/js/Sources/Modulo_Count.pickle
index 3855fda6..2661be17 100644
--- a/js/Sources/Modulo_Count.pickle
+++ b/js/Sources/Modulo_Count.pickle
@@ -29,54 +29,52 @@ g4
 sS'model.evtin'
 p6
 g4
-sS'ini_c'
+sS'exprs'
 p7
-g4
-sS'arg1'
+S'matrix'
 p8
-S'object'
-p9
 sS'graphics.exprs'
-p10
+p9
 NsS'model.dep_ut'
-p11
+p10
 S'vector_boolean'
-p12
+p11
 sS'gr_i'
-p13
+p12
 S'vector'
+p13
+sS'ini_c'
 p14
-sS'exprs'
-p15
-S'matrix'
-p16
+g4
 sS'x.model'
-p17
+p15
 NsS'base'
-p18
+p16
 g4
 sS'graphics'
-p19
-g9
+p17
+S'object'
+p18
 sS'y'
-p20
-g14
+p19
+g13
 sS'x'
+p20
+g13
+sS'model'
 p21
-NsS'model'
-p22
-g9
+g18
 sS'model.ipar'
-p23
+p22
 g4
 sS'typ'
-p24
-g14
+p23
+g13
 sS'x.graphics'
-p25
-g9
+p24
+g18
 sS'model.blocktype'
-p26
+p25
 S'string'
-p27
+p26
 s.
\ No newline at end of file
diff --git a/js/Sources/PULSE_SC.js b/js/Sources/PULSE_SC.js
index 7daafb63..3d6c17f4 100644
--- a/js/Sources/PULSE_SC.js
+++ b/js/Sources/PULSE_SC.js
@@ -50,6 +50,7 @@ function PULSE_SC() {
     }
     PULSE_SC.prototype.get = function PULSE_SC() {
         var y = this.needcompile;
+        this.model.ipar = 1;
         var typ = list();
         var exprs = this.graphics.exprs;
         this.Btitre = "Set Pulse Generator parameters";
@@ -69,6 +70,7 @@ function PULSE_SC() {
     }
     PULSE_SC.prototype.set = function PULSE_SC() {
         var y = this.needcompile;
+        this.model.ipar = 1;
         var typ = list();
         var exprs = this.graphics.exprs;
         this.Btitre = "Set Pulse Generator parameters";
diff --git a/js/Sources/PULSE_SC.pickle b/js/Sources/PULSE_SC.pickle
index 4764e864..ec9cf3b9 100644
--- a/js/Sources/PULSE_SC.pickle
+++ b/js/Sources/PULSE_SC.pickle
@@ -27,7 +27,7 @@ sS'A'
 p3
 S'double'
 p4
-sS'arg1.model.ipar'
+sS'scs_m_1.objs[9-1]'
 p5
 g4
 sS'model.dstate'
@@ -37,171 +37,165 @@ p7
 sS'W'
 p8
 g4
-sS'arg1'
-p9
-S'object'
-p10
 sS'scs_m_1.objs[6-1]'
-p11
+p9
 g4
 sS'scs_m_1.objs[5-1]'
-p12
+p10
 g4
 sS'scs_m_1.objs[3-1]'
-p13
+p11
 g4
 sS'scicos_context'
-p14
+p12
 g4
 sS'model.out'
-p15
+p13
 g4
 sS'x.model'
-p16
-g10
-sS'scs_m_1.objs[9-1]'
-p17
-g4
+p14
+S'object'
+p15
 sS'x.model.rpar'
-p18
-g10
+p16
+g15
 sS'Btitre'
-p19
+p17
 S'string'
-p20
+p18
 sS'E'
-p21
+p19
 g4
 sS'scs_m_1.objs[11-1]'
-p22
+p20
 g4
 sS'model.in2'
-p23
+p21
 g7
 sS'model.intyp'
-p24
+p22
 g4
 sS'model.nzcross'
-p25
+p23
 g4
 sS'model.opar'
-p26
+p24
 g2
 sS'gr_i'
-p27
+p25
 g7
 sS'scs_m_1'
-p28
+p26
 g4
 sS'model.evtin'
-p29
+p27
 g7
 sS'scs_m_1.objs[2-1]'
-p30
+p28
 g4
 sS'model.label'
-p31
-g20
+p29
+g18
 sS'model.sim'
-p32
-g20
+p30
+g18
 sS'model.evtout'
-p33
+p31
 g7
 sS'model.equations'
-p34
+p32
 g2
 sS'scs_m_1.objs[8-1]'
-p35
+p33
 g4
 sS'scs_m_1.objs[10-1]'
-p36
+p34
 g4
 sS'F'
-p37
+p35
 g4
 sS'Ss'
-p38
+p36
 g2
 sS'Exprs0'
-p39
+p37
 S'matrix'
-p40
+p38
 sS'model.out2'
-p41
+p39
 g4
 sS'sblock'
-p42
-g10
+p40
+g15
 sS'model.nmode'
-p43
+p41
 g4
 sS'model.rpar'
-p44
+p42
 g4
 sS'scs_m_1.objs[4-1]'
-p45
+p43
 g4
 sS'sblock.props'
-p46
-g10
+p44
+g15
 sS'model.in'
-p47
+p45
 g7
 sS'graphics'
-p48
-g10
+p46
+g15
 sS'scs_m_1.objs[7-1]'
-p49
+p47
 g4
 sS'model.ipar'
-p50
+p48
 g4
 sS'typ'
-p51
+p49
 g2
 sS'model.outtyp'
-p52
+p50
 g4
 sS'Bitems'
-p53
-g40
+p51
+g38
 sS'ok'
-p54
+p52
 S'boolean'
-p55
+p53
 sS'model.blocktype'
-p56
-g20
+p54
+g18
 sS'scs_m_1.objs[1-1]'
-p57
+p55
 g4
 sS'model.dep_ut'
-p58
+p56
 S'vector_boolean'
-p59
+p57
 sS'exprs'
-p60
+p58
 S'vector_string'
-p61
+p59
 sS'x.graphics.exprs'
-p62
+p60
 NsS'PREVAR_scicos_context'
-p63
+p61
 g4
 sS'model.firing'
-p64
+p62
 g7
 sS'y'
-p65
+p63
 g4
 sS'x'
-p66
-g10
+p64
+g15
 sS'model'
-p67
-g10
+p65
+g15
 sS'model.state'
-p68
+p66
 g7
 s.
\ No newline at end of file
diff --git a/js/Sources/RAMP.pickle b/js/Sources/RAMP.pickle
index ed5f5386..c9e7b160 100644
--- a/js/Sources/RAMP.pickle
+++ b/js/Sources/RAMP.pickle
@@ -21,28 +21,26 @@ S'slope'
 p1
 S'double'
 p2
-sS'arg1'
+sS'graphics'
 p3
 S'object'
 p4
-sS'graphics'
-p5
-g4
 sS'rpar'
-p6
+p5
 S'matrix'
-p7
+p6
 sS'x.model'
-p8
+p7
 NsS'model.out'
-p9
+p8
 g2
 sS'x.graphics'
-p10
+p9
 g4
-sS'model.nzcross'
+sS'typ'
+p10
+S'vector'
 p11
-g2
 sS'model.sim'
 p12
 S'list'
@@ -52,43 +50,43 @@ p14
 g2
 sS'model.rpar'
 p15
-g7
+g6
 sS'model.in'
 p16
-S'vector'
-p17
+g11
 sS'graphics.exprs'
+p17
+NsS'model.nzcross'
 p18
-NsS'typ'
-p19
-g17
+g2
 sS'model.blocktype'
-p20
+p19
 S'string'
-p21
+p20
 sS'iout'
-p22
+p21
 g2
 sS'model.dep_ut'
-p23
+p22
 S'vector_boolean'
-p24
+p23
 sS'stt'
-p25
+p24
 g2
 sS'exprs'
-p26
+p25
 S'vector_string'
-p27
+p26
 sS'gr_i'
-p28
-g17
+p27
+g11
 sS'y'
-p29
-g17
+p28
+g11
 sS'x'
+p29
+g11
+sS'model'
 p30
-NsS'model'
-p31
 g4
 s.
\ No newline at end of file
diff --git a/js/Sources/RAND_f.pickle b/js/Sources/RAND_f.pickle
index b5f6d8b7..f86bf597 100644
--- a/js/Sources/RAND_f.pickle
+++ b/js/Sources/RAND_f.pickle
@@ -23,80 +23,78 @@ S'model.dstate'
 p1
 S'matrix'
 p2
-sS'arg1'
+sS'graphics'
 p3
 S'object'
 p4
-sS'graphics'
-p5
-g4
 sS'x.model'
-p6
+p5
 g4
 sS'model.out'
-p7
+p6
 S'double'
-p8
+p7
 sS'out'
-p9
-g8
+p8
+g7
 sS'x.graphics'
-p10
+p9
 g4
 sS'model.evtin'
-p11
-g8
+p10
+g7
 sS'model.sim'
-p12
+p11
 S'string'
-p13
+p12
 sS'model.rpar'
-p14
+p13
 g2
 sS'flag'
-p15
-g8
+p14
+g7
 sS'graphics.exprs'
-p16
+p15
 g2
 sS'dt'
-p17
-g8
+p16
+g7
 sS'model.ipar'
-p18
-g8
+p17
+g7
 sS'typ'
-p19
+p18
 S'vector'
-p20
+p19
 sS'a'
-p21
-g8
+p20
+g7
 sS'b'
-p22
-g8
+p21
+g7
 sS'model.blocktype'
-p23
-g13
+p22
+g12
 sS'model.dep_ut'
-p24
+p23
 S'vector_boolean'
-p25
+p24
 sS'exprs'
-p26
+p25
 g2
 sS'gr_i'
-p27
-g20
+p26
+g19
 sS'y'
-p28
-g20
+p27
+g19
 sS'x'
+p28
+g19
+sS'model'
 p29
-NsS'model'
-p30
 g4
 sS'nout'
-p31
-g8
+p30
+g7
 s.
\ No newline at end of file
diff --git a/js/Sources/RAND_m.pickle b/js/Sources/RAND_m.pickle
index 621e5395..61e07078 100644
--- a/js/Sources/RAND_m.pickle
+++ b/js/Sources/RAND_m.pickle
@@ -25,116 +25,114 @@ S'model.dstate'
 p1
 S'matrix'
 p2
-sS'arg1'
+sS'exprs[9-1]'
 p3
-S'object'
+S'vector'
 p4
 sS'graphics'
 p5
-g4
-sS'x.model'
+S'object'
 p6
-NsS'funtyp'
+sS'x.model'
 p7
-S'double'
+NsS'funtyp'
 p8
-sS'model.out'
+S'double'
 p9
-g8
-sS'out'
+sS'model.out'
 p10
-g8
-sS'model.in2'
+g9
+sS'out'
 p11
-S'vector'
+g9
+sS'model.in2'
 p12
+g4
 sS'model.intyp'
 p13
-g12
+g4
 sS'x.graphics'
 p14
-g4
-sS'exprs[9-1]'
-p15
-g12
+g6
 sS'model.evtin'
-p16
-g8
+p15
+g9
 sS'model.firing'
-p17
-g12
+p16
+g4
 sS'function_name'
-p18
+p17
 S'string'
-p19
+p18
 sS'model.sim'
-p20
+p19
 S'list'
-p21
+p20
 sS'model.evtout'
-p22
-g12
+p21
+g4
 sS'model.out2'
-p23
-g8
+p22
+g9
 sS'model.rpar'
-p24
-g12
+p23
+g4
 sS'model.outtyp'
-p25
-g8
+p24
+g9
 sS'flag'
-p26
-g8
+p25
+g9
 sS'model.state'
-p27
-g12
+p26
+g4
 sS'model.in'
-p28
-g12
+p27
+g4
 sS'graphics.exprs'
-p29
+p28
 NsS'dt'
-p30
-g8
+p29
+g9
 sS'model.ipar'
-p31
-g8
+p30
+g9
 sS'typ'
-p32
-g12
+p31
+g4
 sS'a'
-p33
-g8
+p32
+g9
 sS'b'
-p34
-g8
+p33
+g9
 sS'ok'
-p35
+p34
 S'boolean'
-p36
+p35
 sS'model.blocktype'
-p37
-g19
+p36
+g18
 sS'model.dep_ut'
-p38
+p37
 S'vector_boolean'
-p39
+p38
 sS'exprs'
-p40
+p39
 g2
 sS'gr_i'
-p41
-g12
+p40
+g4
 sS'y'
-p42
-g12
+p41
+g4
 sS'x'
-p43
-NsS'model'
-p44
+p42
 g4
+sS'model'
+p43
+g6
 sS'ot'
-p45
-g8
+p44
+g9
 s.
\ No newline at end of file
diff --git a/js/Sources/READAU_f.pickle b/js/Sources/READAU_f.pickle
index ffed799c..972036fe 100644
--- a/js/Sources/READAU_f.pickle
+++ b/js/Sources/READAU_f.pickle
@@ -29,38 +29,38 @@ sS'model.dstate'
 p3
 S'matrix'
 p4
-sS'arg1'
+sS'offset'
 p5
-S'object'
+S'double'
 p6
-sS'graphics'
-p7
-g6
 sS'dstate'
-p8
+p7
 g4
 sS'x.model'
+p8
+S'object'
 p9
-g6
 sS'model.dep_ut'
 p10
 S'vector_boolean'
 p11
 sS'model.out'
 p12
-S'double'
-p13
+g6
 sS'out'
+p13
+NsS'graphics'
 p14
-NsS'x.graphics'
+g9
+sS'x.graphics'
 p15
-g6
+g9
 sS'lunit'
 p16
-g13
+g6
 sS'swap'
 p17
-g13
+g6
 sS'fname'
 p18
 S'string'
@@ -70,67 +70,65 @@ p20
 g19
 sS'model.evtin'
 p21
-g13
+g6
 sS'tmask1'
 p22
 g2
-sS'graphics.exprs'
+sS'model.sim'
 p23
-NsS'model.sim'
-p24
 S'list'
-p25
+p24
 sS'M'
-p26
-g13
+p25
+g6
 sS'N'
+p26
+g6
+sS'graphics.exprs'
 p27
-g13
-sS'offset'
+NsS'model.ipar'
 p28
-g13
-sS'model.ipar'
-p29
 g4
 sS'typ'
-p30
+p29
 g2
 sS'imask'
-p31
-g13
+p30
+g6
 sS'model.blocktype'
-p32
+p31
 g19
 sS'outmask'
-p33
-g13
+p32
+g6
 sS'frmt1'
-p34
+p33
 g19
 sS'fname1'
-p35
-g13
+p34
+g6
 sS'exprs'
-p36
+p35
 g4
 sS'gr_i'
-p37
+p36
 g2
 sS'ievt'
-p38
-g13
+p37
+g6
 sS'ipar'
-p39
+p38
 g4
 sS'y'
-p40
+p39
 g2
 sS'x'
+p40
+g2
+sS'model'
 p41
-NsS'model'
+g9
+sS'nout'
 p42
 g6
-sS'nout'
-p43
-g13
 s.
\ No newline at end of file
diff --git a/js/Sources/READC_f.pickle b/js/Sources/READC_f.pickle
index 44fd236c..0490a7d1 100644
--- a/js/Sources/READC_f.pickle
+++ b/js/Sources/READC_f.pickle
@@ -39,126 +39,123 @@ sS'model.dstate'
 p3
 S'matrix'
 p4
-sS'arg1'
-p5
-S'object'
-p6
 sS'graphics.exprs'
-p7
+p5
 NsS'dstate'
-p8
+p6
 g4
 sS'rpar'
-p9
+p7
 S'vector'
-p10
+p8
 sS'x.model'
-p11
-g6
+p9
+S'object'
+p10
 sS'model.dep_ut'
-p12
+p11
 S'vector_boolean'
-p13
+p12
 sS'model.out'
-p14
+p13
 g2
 sS'outpt'
-p15
+p14
 g2
 sS'out'
-p16
+p15
 g2
 sS'x.graphics'
-p17
-g6
+p16
+g10
 sS'lunit'
-p18
+p17
 g2
 sS'offset'
-p19
+p18
 g2
 sS'swap'
-p20
+p19
 g2
 sS'fname'
-p21
+p20
 S'string'
-p22
+p21
 sS'frmt'
-p23
-g22
+p22
+g21
 sS'model.evtin'
-p24
+p23
 g2
 sS'tmask1'
-p25
+p24
 g2
 sS'model.firing'
-p26
+p25
 g2
 sS'model.sim'
-p27
+p26
 S'list'
-p28
+p27
 sS'model.evtout'
-p29
-g10
+p28
+g8
 sS'M'
-p30
+p29
 g2
 sS'fmts'
-p31
+p30
 S'vector_string'
-p32
+p31
 sS'N'
-p33
+p32
 g2
 sS'graphics'
-p34
-g6
+p33
+g10
 sS'model.ipar'
-p35
+p34
 g4
 sS'typ'
-p36
-g10
+p35
+g8
 sS'imask'
-p37
+p36
 g2
 sS'model.blocktype'
-p38
-g22
+p37
+g21
 sS'outmask'
-p39
+p38
 g2
 sS'frmt1'
-p40
-g22
+p39
+g21
 sS'fname1'
-p41
+p40
 g2
 sS'exprs'
-p42
+p41
 g4
 sS'gr_i'
-p43
-g10
+p42
+g8
 sS'ievt'
-p44
+p43
 g2
 sS'ipar'
-p45
+p44
 g4
 sS'y'
+p45
+g8
+sS'x'
 p46
 g10
-sS'x'
-p47
-g6
 sS'model'
-p48
-g6
+p47
+g10
 sS'nout'
-p49
+p48
 g2
 s.
\ No newline at end of file
diff --git a/js/Sources/RFILE_f.pickle b/js/Sources/RFILE_f.pickle
index 9e11ca6a..97e5f921 100644
--- a/js/Sources/RFILE_f.pickle
+++ b/js/Sources/RFILE_f.pickle
@@ -38,104 +38,102 @@ sS'model.sim'
 p6
 S'string'
 p7
-sS'arg1'
-p8
-S'object'
-p9
 sS'graphics.exprs'
-p10
+p8
 NsS'dstate'
-p11
+p9
 g4
 sS'rpar'
-p12
+p10
 S'vector'
-p13
+p11
 sS'x.model'
-p14
-g9
+p12
+S'object'
+p13
 sS'model.dep_ut'
-p15
+p14
 S'vector_boolean'
-p16
+p15
 sS'model.out'
-p17
+p16
 g2
 sS'out'
-p18
+p17
 g2
 sS'x.graphics'
-p19
-g9
+p18
+g13
 sS'lunit'
-p20
+p19
 g2
 sS'fname'
-p21
+p20
 g7
 sS'frmt'
-p22
+p21
 g7
 sS'model.evtin'
-p23
+p22
 g2
 sS'tmask1'
-p24
+p23
 g2
 sS'model.firing'
-p25
+p24
 g2
 sS'exprs[6-1]'
-p26
-g13
+p25
+g11
 sS'N'
-p27
+p26
 g2
 sS'graphics'
-p28
-g9
+p27
+g13
 sS'model.ipar'
-p29
+p28
 g4
 sS'typ'
-p30
-g13
+p29
+g11
 sS'imask'
-p31
+p30
 g2
 sS'model.blocktype'
-p32
+p31
 g7
 sS'outmask'
-p33
+p32
 g2
 sS'frmt1'
-p34
+p33
 g2
 sS'fname1'
-p35
+p34
 g2
 sS'exprs'
-p36
+p35
 g4
 sS'gr_i'
-p37
-g13
+p36
+g11
 sS'ievt'
-p38
+p37
 g2
 sS'ipar'
-p39
+p38
 g4
 sS'y'
-p40
-g13
+p39
+g11
 sS'x'
+p40
+g11
+sS'model'
 p41
-NsS'model'
-p42
-g9
+g13
 sS'nout'
-p43
+p42
 g2
 s.
\ No newline at end of file
diff --git a/js/Sources/SAWTOOTH_f.pickle b/js/Sources/SAWTOOTH_f.pickle
index 2e4584ec..ab2c8066 100644
--- a/js/Sources/SAWTOOTH_f.pickle
+++ b/js/Sources/SAWTOOTH_f.pickle
@@ -44,7 +44,8 @@ p13
 g12
 sS'x'
 p14
-NsS'model'
+g12
+sS'model'
 p15
 S'object'
 p16
diff --git a/js/Sources/STEP.pickle b/js/Sources/STEP.pickle
index 6cfc309f..d750f79c 100644
--- a/js/Sources/STEP.pickle
+++ b/js/Sources/STEP.pickle
@@ -17,84 +17,82 @@ p7
 atp8
 Rp9
 .(dp0
-S'arg1'
+S'graphics'
 p1
 S'object'
 p2
-sS'graphics'
-p3
-g2
 sS'rpar'
-p4
+p3
 S'matrix'
-p5
+p4
 sS'x.model'
-p6
+p5
 NsS'model.out'
-p7
+p6
 S'double'
-p8
+p7
 sS'x.graphics'
-p9
+p8
 g2
 sS'model.evtin'
-p10
-g8
+p9
+g7
 sS'model.firing'
-p11
-g8
+p10
+g7
 sS'model.sim'
-p12
+p11
 S'list'
-p13
+p12
 sS'model.evtout'
-p14
-g8
+p13
+g7
 sS'model.out2'
-p15
-g8
+p14
+g7
 sS'in1'
-p16
+p15
 S'string'
-p17
+p16
 sS'model.rpar'
-p18
-g5
+p17
+g4
 sS'model.outtyp'
-p19
-g8
+p18
+g7
 sS'graphics.exprs'
-p20
+p19
 NsS'fi'
-p21
-g17
+p20
+g16
 sS'typ'
-p22
+p21
 S'vector'
-p23
+p22
 sS'ok'
-p24
+p23
 S'boolean'
-p25
+p24
 sS'model.blocktype'
-p26
-g17
+p25
+g16
 sS'model.dep_ut'
-p27
+p26
 S'vector_boolean'
-p28
+p27
 sS'exprs'
-p29
-g5
+p28
+g4
 sS'gr_i'
-p30
-g23
+p29
+g22
 sS'y'
-p31
-g23
+p30
+g22
 sS'x'
+p31
+g22
+sS'model'
 p32
-NsS'model'
-p33
 g2
 s.
\ No newline at end of file
diff --git a/js/Sources/STEP_FUNCTION.js b/js/Sources/STEP_FUNCTION.js
index fa182cb0..e7d89c2d 100644
--- a/js/Sources/STEP_FUNCTION.js
+++ b/js/Sources/STEP_FUNCTION.js
@@ -58,6 +58,8 @@ function STEP_FUNCTION() {
         alert("parameters cannot be modified");
     }
     STEP_FUNCTION.prototype.set = function STEP_FUNCTION() {
+        for (i=1;i<=length(this.model.rpar.objs);i+=1) {
+            var o = this.model.rpar.objs[i-1];
             if (typeof(o)=="Block"&&o.gui=="STEP") {
                 var ppath = list(i);
                 break;
@@ -73,6 +75,7 @@ function STEP_FUNCTION() {
                 spath[$+1-1] = "objs";
                 spath[$+1-1] = path[k-1];
             }
+            var xx = getObjectFromKeyList(this, spath);
             execstr("xxn="+xx.gui+"(\'set\',xx)");
             if (diffobjs(this.xxn,xx)) {
                 this.model = xx.model;
@@ -111,6 +114,7 @@ function STEP_FUNCTION() {
                         var needcompile = 4;
                     }
                 }
+                getObjectFromKeyList(this, spath) = this.xxn;
                 newpar[size(newpar)+1-1] = path;
             }
         }
diff --git a/js/Sources/STEP_FUNCTION.pickle b/js/Sources/STEP_FUNCTION.pickle
index 622150c0..3e939cf4 100644
--- a/js/Sources/STEP_FUNCTION.pickle
+++ b/js/Sources/STEP_FUNCTION.pickle
@@ -28,144 +28,132 @@ sS'ppath'
 p6
 S'list'
 p7
-sS'arg1'
-p8
-S'object'
-p9
 sS'graphics.exprs'
-p10
+p8
 S'vector_string'
-p11
+p9
 sS'scs_m_1.objs[3-1]'
-p12
+p10
 g4
 sS'xx'
-p13
-g9
+p11
+S'object'
+p12
 sS'spath[$+1-1]'
-p14
+p13
 g4
 sS'model.out'
-p15
+p14
 g4
 sS'eq'
-p16
-g9
+p15
+g12
 sS'graphics.orig'
-p17
+p16
 g2
 sS'model.ipar'
-p18
+p17
 g4
 sS'blk'
-p19
-g9
+p18
+g12
 sS'newpar[size(newpar)+1-1]'
-p20
+p19
 NsS'scs_m_1'
-p21
-g9
+p20
+g12
 sS'eqn'
-p22
-g9
+p21
+g12
 sS'np'
-p23
+p22
 g4
 sS'blk.model'
-p24
+p23
 NsS'graphics.pein'
-p25
+p24
 g4
 sS'lnk.from'
-p26
+p25
 g2
 sS'scs_m_1.objs[2-1]'
-p27
-g9
+p26
+g12
 sS'model.sim'
-p28
+p27
 S'string'
-p29
+p28
 sS'spath'
-p30
+p29
 g7
 sS'newpar'
-p31
+p30
 g7
 sS'lnk.yy'
-p32
+p31
 g2
 sS'model.out2'
-p33
-g4
-sS'graphics.pout'
-p34
+p32
 g4
 sS'model.rpar'
-p35
-g9
+p33
+g12
 sS'model_n'
-p36
-g9
-sS'arg1[spath-1]'
-p37
-g9
+p34
+g12
 sS'scs_m_1.objs[4-1]'
-p38
+p35
 g4
 sS'graphics.pin'
-p39
+p36
 g4
 sS'graphics'
-p40
+p37
 NsS'model.outtyp'
-p41
+p38
 g4
 sS'graphics.sz'
-p42
+p39
 g2
 sS'typ'
-p43
+p40
 g7
 sS'xxn'
-p44
-g9
+p41
+g12
 sS'lnk.xx'
-p45
+p42
 g2
 sS'needcompile'
-p46
+p43
+g4
+sS'graphics.pout'
+p44
 g4
-sS'arg1.model'
-p47
-g9
 sS'scs_m_1.objs[1-1]'
-p48
-g9
+p45
+g12
 sS'modified'
-p49
+p46
 g4
 sS'o'
-p50
-g9
+p47
+g12
 sS'gr_i'
-p51
+p48
 g2
-sS'blk.graphics'
-p52
-NsS'y'
-p53
+sS'y'
+p49
 g4
 sS'x'
-p54
-g9
+p50
+g2
 sS'model'
-p55
-g9
+p51
+g12
 sS'lnk.to'
-p56
+p52
 g2
-sS'arg1.model.rpar'
-p57
-g9
-s.
\ No newline at end of file
+sS'blk.graphics'
+p53
+Ns.
\ No newline at end of file
diff --git a/js/Sources/SampleCLK.pickle b/js/Sources/SampleCLK.pickle
index b9ddae6e..3528afe6 100644
--- a/js/Sources/SampleCLK.pickle
+++ b/js/Sources/SampleCLK.pickle
@@ -37,41 +37,39 @@ sS'x.graphics'
 p9
 S'object'
 p10
-sS'arg1'
-p11
-g10
 sS'graphics.exprs'
-p12
+p11
 NsS'model.rpar'
-p13
+p12
 S'vector'
-p14
+p13
 sS'exprs'
-p15
+p14
 S'matrix'
-p16
+p15
 sS'x.model'
-p17
+p16
 g10
 sS'model.dep_ut'
-p18
+p17
 S'vector_boolean'
-p19
+p18
 sS'graphics'
-p20
+p19
 g10
 sS'y'
-p21
+p20
 g2
 sS'x'
+p21
+g13
+sS'model'
 p22
-NsS'model'
-p23
 g10
 sS'typ'
-p24
-g14
+p23
+g13
 sS'model.firing'
-p25
+p24
 g2
 s.
\ No newline at end of file
diff --git a/js/Sources/Sigbuilder.js b/js/Sources/Sigbuilder.js
index 9383cc34..fe47c03a 100644
--- a/js/Sources/Sigbuilder.js
+++ b/js/Sources/Sigbuilder.js
@@ -23,6 +23,8 @@ function Sigbuilder() {
     }
     Sigbuilder.prototype.set = function Sigbuilder() {
         var ppath = list(0);
+        for (i=1;i<=length(this.model.rpar.objs);i+=1) {
+            var o = this.model.rpar.objs[i-1];
             if (typeof(o)=="Block"&&o.gui=="CURVE_c") {
                 ppath[1-1] = i;
                 break;
@@ -39,6 +41,7 @@ function Sigbuilder() {
                 spath[$+1-1] = "objs";
                 spath[$+1-1] = path[k-1];
             }
+            var xx = getObjectFromKeyList(this, spath);
             execstr("xxn="+xx.gui+"(\'set\',xx)");
             if (diffobjs(this.xxn,xx)) {
                 this.model = xx.model;
@@ -80,6 +83,7 @@ function Sigbuilder() {
                         var needcompile = 4;
                     }
                 }
+                getObjectFromKeyList(this, spath) = this.xxn;
                 newpar[size(newpar)+1-1] = path;
                 this.y = max(this.y,needcompile);
             }
diff --git a/js/Sources/Sigbuilder.pickle b/js/Sources/Sigbuilder.pickle
index d052935f..76e944e0 100644
--- a/js/Sources/Sigbuilder.pickle
+++ b/js/Sources/Sigbuilder.pickle
@@ -36,110 +36,110 @@ sS'ppath'
 p6
 S'list'
 p7
-sS'arg1'
-p8
-S'object'
-p9
 sS'scs_m_1.objs[6-1]'
-p10
+p8
 g2
 sS'scs_m_1.objs[3-1]'
-p11
+p9
 g2
 sS'NP'
-p12
+p10
 g2
 sS'A[j+2-1][i+this.N+1-1]'
-p13
+p11
 g2
 sS'xx'
-p14
-g9
+p12
+S'object'
+p13
 sS'B'
-p15
+p14
 g2
 sS'y[this.N-1]'
-p16
+p15
 g2
 sS'spath[$+1-1]'
-p17
+p16
 g2
 sS'X'
-p18
+p17
 S'matrix'
-p19
+p18
 sS'eq'
-p20
-g9
+p19
+g13
 sS'Zt'
-p21
-g19
+p20
+g18
 sS'Q[i-1][i-1]'
-p22
+p21
 g2
 sS'Bt'
-p23
-g19
+p22
+g18
 sS'orpar'
-p24
+p23
 S'vector'
-p25
+p24
 sS'Q[i+this.N-1][i-1]'
-p26
+p25
 g2
 sS'A[j+1-1][i-1]'
-p27
+p26
 g2
 sS'A[j+2-1][i-1]'
-p28
+p27
 g2
 sS'newpar[size(newpar)+1-1]'
-p29
+p28
 NsS'Q[i+this.N-1][i+this.N-1]'
-p30
+p29
 g2
 sS'scs_m_1'
-p31
+p30
 g2
 sS'eqn'
-p32
-g9
+p31
+g13
 sS'np'
-p33
+p32
 g2
 sS'METHOD'
-p34
+p33
 g4
 sS'scs_m_1.objs[2-1]'
-p35
+p34
 g2
 sS'A'
-p36
+p35
 g2
 sS'C'
-p37
-g25
+p36
+g24
 sS'spath'
-p38
+p37
 g7
 sS'scs_m_1.objs[8-1]'
-p39
+p38
 g2
 sS'newpar'
-p40
+p39
 g7
 sS'A[j+2-1][i+this.N-1]'
-p41
+p40
 g2
 sS'A[j+1-1][i+this.N-1]'
-p42
+p41
 g2
+sS'model.rpar'
+p42
+g13
 sS'model_n'
 p43
-g9
-sS'arg1[spath-1]'
+g13
+sS'Q'
 p44
-g9
+g2
 sS'scs_m_1.objs[4-1]'
 p45
 g2
@@ -156,65 +156,56 @@ p49
 g2
 sS'Z'
 p50
-g25
+g24
 sS'typ'
 p51
 g7
 sS'xxn'
 p52
-g9
+g13
 sS'needcompile'
 p53
 g2
-sS'Q'
-p54
-g2
-sS'arg1.model'
-p55
-g9
 sS'A[j-1][i+2*this.N-1]'
-p56
+p54
 g2
 sS'd'
-p57
+p55
 g2
 sS'B[j-1]'
-p58
+p56
 g2
 sS'Q[i-1][i+this.N-1]'
-p59
+p57
 g2
 sS'scs_m_1.objs[1-1]'
-p60
+p58
 g2
 sS'modified'
-p61
+p59
 g2
 sS'o'
-p62
-g9
+p60
+g13
 sS'B[j+1-1]'
-p63
+p61
 g2
 sS'N'
-p64
+p62
 g2
 sS'gr_i'
-p65
-g25
+p63
+g24
 sS'At'
-p66
-g19
+p64
+g18
 sS'y'
-p67
+p65
 g2
 sS'x'
-p68
-g9
+p66
+g24
 sS'model'
-p69
-g9
-sS'arg1.model.rpar'
-p70
-g9
+p67
+g13
 s.
\ No newline at end of file
diff --git a/js/Sources/TIME_f.pickle b/js/Sources/TIME_f.pickle
index e4b21f58..8f7a212f 100644
--- a/js/Sources/TIME_f.pickle
+++ b/js/Sources/TIME_f.pickle
@@ -35,7 +35,8 @@ p10
 g9
 sS'x'
 p11
-NsS'model'
+g9
+sS'model'
 p12
 S'object'
 p13
diff --git a/js/Sources/TKSCALE.pickle b/js/Sources/TKSCALE.pickle
index 84b2c62c..8bd5e071 100644
--- a/js/Sources/TKSCALE.pickle
+++ b/js/Sources/TKSCALE.pickle
@@ -41,44 +41,42 @@ sS'x.graphics'
 p9
 S'object'
 p10
-sS'arg1'
+sS'graphics'
 p11
 g10
-sS'graphics.exprs'
+sS'model.rpar'
 p12
-NsS'model.rpar'
-p13
 S'matrix'
-p14
+p13
 sS'exprs'
-p15
-g14
+p14
+g13
 sS'x.model'
-p16
+p15
 NsS'gr_i'
-p17
+p16
 S'vector'
-p18
+p17
 sS'model.dep_ut'
-p19
+p18
 S'vector_boolean'
+p19
+sS'graphics.exprs'
 p20
-sS'graphics'
+NsS'y'
 p21
-g10
-sS'y'
-p22
-g18
+g17
 sS'x'
+p22
+g17
+sS'model'
 p23
-NsS'model'
-p24
 g10
 sS'typ'
-p25
-g18
+p24
+g17
 sS'model.blocktype'
-p26
+p25
 S'string'
-p27
+p26
 s.
\ No newline at end of file