diff --git a/pd/doc/4.data.structures/pd-l2ork/ds-demos/bulbs.pd b/pd/doc/4.data.structures/pd-l2ork/ds-demos/bulbs.pd
index ae95c888e91db3d9c735bdbea6cd5462ab9dca83..0a1123e83c590e0dc727691bcf7a119c8cd4709b 100644
--- a/pd/doc/4.data.structures/pd-l2ork/ds-demos/bulbs.pd
+++ b/pd/doc/4.data.structures/pd-l2ork/ds-demos/bulbs.pd
@@ -1,9 +1,37 @@
 #N struct bulb float x float y float r float g float b float a float
 s;
-#N canvas 0 48 650 529 10;
-#N canvas 644 19 538 195 bulb 0;
-#X obj 87 87 loadbang;
-#X obj 87 57 outlet;
+#N canvas 199 68 650 527 10;
+#X obj 350 170 random 255;
+#X obj 420 170 random 255;
+#X obj 490 170 random 255;
+#X obj 350 134 trigger bang bang bang anything;
+#X obj 350 240 set bulb r g b a s;
+#X scalar bulb 37 89 50 26 143 1 2 \;;
+#X scalar bulb 207 89 141 98 156 1 2 \;;
+#X scalar bulb 117 89 221 41 109 1 2 \;;
+#X scalar bulb 37 189 147 213 194 1 2 \;;
+#X scalar bulb 204 187 147 213 194 1 2 \;;
+#X scalar bulb 117 189 162 230 120 1 2 \;;
+#X scalar bulb 37 289 107 163 157 1 2 \;;
+#X scalar bulb 207 289 2 197 206 1 2 \;;
+#X scalar bulb 117 289 125 4 42 1 2 \;;
+#X scalar bulb 287 289 22 49 33 1 2 \;;
+#X scalar bulb 467 289 105 204 27 1 2 \;;
+#X scalar bulb 377 289 224 181 45 1 2 \;;
+#X scalar bulb 37 -11 36 28 222 1 2 \;;
+#X scalar bulb 207 -11 122 187 225 1 2 \;;
+#X scalar bulb 117 -11 103 152 169 1 2 \;;
+#X obj 399 112 set bulb s a;
+#X obj 350 211 pack f f f 0.3 5;
+#X msg 399 91 2 1 \$1;
+#X text 76 426 Light Bulbs;
+#X text 76 426 ___________;
+#X text 76 446 This is just a quick demo to show enter/leave functionality
+for scalars.;
+#X obj 350 66 route mouseover mouseout;
+#X obj 564 168 unpack p;
+#N canvas 231 69 538 264 bulb 0;
+#X obj 87 77 loadbang;
 #X obj 87 21 struct bulb float x float y float r float g float b float
 a float s;
 #N canvas 537 133 450 300 (subpatch) 0;
@@ -36,51 +64,24 @@ a float s;
 #X msg 34 102 fill r g b a \, stroke-width s \, stroke r g b;
 #X connect 0 0 20 0;
 #X connect 20 0 1 0;
-#X restore 87 128 group;
-#X msg 88 108 transform scale 0.5 \, fill none \, stroke black;
+#X restore 88 133 group;
+#X obj 88 154 outlet;
+#X msg 88 98 transform scale 0.5 \, fill none \, stroke black \, mouseover
+1 \, mouseout 1;
 #X connect 0 0 4 0;
-#X connect 2 0 1 0;
-#X connect 4 0 3 0;
+#X connect 2 0 3 0;
+#X connect 4 0 2 0;
 #X restore 350 42 pd bulb;
-#X obj 350 66 route enter leave;
-#X obj 350 170 random 255;
-#X obj 420 170 random 255;
-#X obj 490 170 random 255;
-#X obj 350 134 trigger bang bang bang anything;
-#X obj 564 168 t a;
-#X obj 350 240 set bulb r g b a s;
-#X scalar bulb 37 89 125 47 144 1 2 \;;
-#X scalar bulb 207 89 184 112 128 1 2 \;;
-#X scalar bulb 117 89 2 197 206 1 2 \;;
-#X scalar bulb 37 189 147 213 194 1 2 \;;
-#X scalar bulb 204 187 141 98 156 1 2 \;;
-#X scalar bulb 117 189 22 49 33 1 2 \;;
-#X scalar bulb 37 289 105 204 27 1 2 \;;
-#X scalar bulb 207 289 122 187 225 1 2 \;;
-#X scalar bulb 117 289 224 181 45 1 2 \;;
-#X scalar bulb 287 289 194 27 193 1 2 \;;
-#X scalar bulb 467 289 189 236 185 1 2 \;;
-#X scalar bulb 377 289 143 169 166 1 2 \;;
-#X scalar bulb 37 -11 95 53 41 1 2 \;;
-#X scalar bulb 207 -11 94 118 18 1 2 \;;
-#X scalar bulb 117 -11 230 65 224 1 2 \;;
-#X obj 399 112 set bulb s a;
-#X obj 350 211 pack f f f 0.3 5;
-#X msg 399 91 2 1 \$1;
-#X text 76 426 Light Bulbs;
-#X text 76 426 ___________;
-#X text 76 446 This is just a quick demo to show enter/leave functionality
-for scalars.;
-#X connect 0 0 1 0;
-#X connect 1 0 5 0;
-#X connect 1 1 25 0;
-#X connect 2 0 24 0;
-#X connect 3 0 24 1;
-#X connect 4 0 24 2;
-#X connect 5 0 2 0;
-#X connect 5 1 3 0;
-#X connect 5 2 4 0;
-#X connect 5 3 6 0;
-#X connect 6 0 7 5;
-#X connect 24 0 7 0;
-#X connect 25 0 23 0;
+#X connect 0 0 21 0;
+#X connect 1 0 21 1;
+#X connect 2 0 21 2;
+#X connect 3 0 0 0;
+#X connect 3 1 1 0;
+#X connect 3 2 2 0;
+#X connect 3 3 27 0;
+#X connect 21 0 4 0;
+#X connect 22 0 20 0;
+#X connect 26 0 3 0;
+#X connect 26 1 22 0;
+#X connect 27 0 4 5;
+#X connect 28 0 26 0;