diff --git a/sources/NotoSansSinhala.glyphspackage/fontinfo.plist b/sources/NotoSansSinhala.glyphspackage/fontinfo.plist
index 3498e3fa..513c8f6c 100644
--- a/sources/NotoSansSinhala.glyphspackage/fontinfo.plist
+++ b/sources/NotoSansSinhala.glyphspackage/fontinfo.plist
@@ -22,7 +22,7 @@ code = "khasinh ghasinh ngasinh casinh chasinh jasinh jhasinh nyjasinh ttasinh t
 name = blwsMarkAttchmentSet1;
 },
 {
-code = "kasinh gasinh nngasinh tasinh shasinh\012";
+code = "kasinh gasinh nngasinh tasinh shasinh hasinh\012";
 name = blwsMarkAttachementSet2;
 },
 {
@@ -903,12 +903,6 @@ alignmentZones = (
 ascender = 1011;
 capHeight = 612;
 descender = -293;
-guideLines = (
-{
-name = "sa-shoulder";
-position = "{-98, 413}";
-}
-);
 id = "7977A986-4EFB-4152-84F8-5A02CD382AAF";
 verticalStems = (
 27
@@ -926,12 +920,6 @@ alignmentZones = (
 ascender = 1011;
 capHeight = 612;
 descender = -293;
-guideLines = (
-{
-name = "pa-terminal";
-position = "{-118, 458}";
-}
-);
 id = UUID0;
 verticalStems = (
 73
@@ -967,7 +955,6 @@ id = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
 verticalStems = (
 140
 );
-visible = 1;
 weight = Bold;
 weightValue = 190;
 xHeight = 536;
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/_part.ka.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/_part.ka.glyph
new file mode 100644
index 00000000..7b477668
--- /dev/null
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/_part.ka.glyph
@@ -0,0 +1,372 @@
+{
+export = 0;
+glyphname = _part.ka;
+layers = (
+{
+layerId = "7977A986-4EFB-4152-84F8-5A02CD382AAF";
+paths = (
+{
+closed = 1;
+nodes = (
+"604 -11 OFFCURVE",
+"649 77 OFFCURVE",
+"649 193 CURVE SMOOTH",
+"649 351 OFFCURVE",
+"553 448 OFFCURVE",
+"384 448 CURVE SMOOTH",
+"312 448 OFFCURVE",
+"258 431 OFFCURVE",
+"225 413 CURVE",
+"184 376 LINE",
+"261 410 OFFCURVE",
+"303 422 OFFCURVE",
+"383 422 CURVE SMOOTH",
+"538 422 OFFCURVE",
+"622 337 OFFCURVE",
+"622 193 CURVE SMOOTH",
+"622 106 OFFCURVE",
+"598 15 OFFCURVE",
+"489 15 CURVE SMOOTH",
+"415 15 OFFCURVE",
+"362 66 OFFCURVE",
+"362 166 CURVE SMOOTH",
+"362 204 LINE",
+"336 204 LINE",
+"336 166 LINE SMOOTH",
+"336 84 OFFCURVE",
+"300 15 OFFCURVE",
+"211 15 CURVE SMOOTH",
+"107 15 OFFCURVE",
+"91 101 OFFCURVE",
+"91 170 CURVE SMOOTH",
+"91 181 OFFCURVE",
+"92 208 OFFCURVE",
+"98 244 CURVE",
+"72 244 LINE",
+"69 213 OFFCURVE",
+"64 181 OFFCURVE",
+"64 170 CURVE SMOOTH",
+"64 21 OFFCURVE",
+"143 -11 OFFCURVE",
+"211 -11 CURVE SMOOTH",
+"276 -11 OFFCURVE",
+"325 19 OFFCURVE",
+"349 98 CURVE",
+"366 41 OFFCURVE",
+"406 -11 OFFCURVE",
+"492 -11 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"784 567 LINE",
+"753 587 OFFCURVE",
+"697 612 OFFCURVE",
+"607 612 CURVE SMOOTH",
+"484 612 OFFCURVE",
+"373 561 OFFCURVE",
+"266 476 CURVE",
+"260 471 LINE",
+"184 395 OFFCURVE",
+"77 263 OFFCURVE",
+"-2 151 CURVE",
+"22 136 LINE",
+"69 201 LINE",
+"74 202 LINE",
+"125 274 OFFCURVE",
+"177 343 OFFCURVE",
+"229 401 CURVE",
+"240 415 LINE",
+"364 534 OFFCURVE",
+"487 586 OFFCURVE",
+"605 586 CURVE SMOOTH",
+"638 586 OFFCURVE",
+"718 582 OFFCURVE",
+"767 544 CURVE"
+);
+},
+{
+closed = 1;
+nodes = (
+"98 591 OFFCURVE",
+"45 548 OFFCURVE",
+"45 468 CURVE SMOOTH",
+"45 450 OFFCURVE",
+"46 436 OFFCURVE",
+"52 413 CURVE",
+"78 413 LINE",
+"74 431 OFFCURVE",
+"72 445 OFFCURVE",
+"72 468 CURVE SMOOTH",
+"72 538 OFFCURVE",
+"116 565 OFFCURVE",
+"161 565 CURVE SMOOTH",
+"222 565 OFFCURVE",
+"252 522 OFFCURVE",
+"252 470 CURVE SMOOTH",
+"252 457 OFFCURVE",
+"252 446 OFFCURVE",
+"250 438 CURVE",
+"272 450 LINE",
+"274 456 OFFCURVE",
+"275 471 OFFCURVE",
+"275 486 CURVE SMOOTH",
+"275 543 OFFCURVE",
+"229 591 OFFCURVE",
+"161 591 CURVE SMOOTH"
+);
+}
+);
+width = 945;
+},
+{
+layerId = UUID0;
+paths = (
+{
+closed = 1;
+nodes = (
+"613 -11 OFFCURVE",
+"673 79 OFFCURVE",
+"673 192 CURVE SMOOTH",
+"673 361 OFFCURVE",
+"574 448 OFFCURVE",
+"414 448 CURVE SMOOTH",
+"340 448 OFFCURVE",
+"288 432 OFFCURVE",
+"263 415 CURVE",
+"166 322 LINE",
+"260 370 OFFCURVE",
+"308 383 OFFCURVE",
+"390 383 CURVE SMOOTH",
+"538 383 OFFCURVE",
+"600 309 OFFCURVE",
+"600 191 CURVE SMOOTH",
+"600 119 OFFCURVE",
+"575 60 OFFCURVE",
+"497 60 CURVE SMOOTH",
+"418 60 OFFCURVE",
+"402 119 OFFCURVE",
+"402 204 CURVE SMOOTH",
+"402 214 LINE",
+"335 214 LINE",
+"335 208 LINE SMOOTH",
+"335 107 OFFCURVE",
+"301 60 OFFCURVE",
+"243 60 CURVE SMOOTH",
+"162 60 OFFCURVE",
+"141 115 OFFCURVE",
+"141 187 CURVE SMOOTH",
+"141 214 OFFCURVE",
+"145 264 OFFCURVE",
+"170 307 CURVE",
+"116 266 LINE",
+"104 258 OFFCURVE",
+"82 184 OFFCURVE",
+"82 157 CURVE SMOOTH",
+"82 22 OFFCURVE",
+"172 -11 OFFCURVE",
+"238 -11 CURVE SMOOTH",
+"303 -11 OFFCURVE",
+"335 15 OFFCURVE",
+"368 77 CURVE",
+"396 27 OFFCURVE",
+"430 -11 OFFCURVE",
+"502 -11 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"792 571 LINE",
+"734 604 OFFCURVE",
+"677 612 OFFCURVE",
+"610 612 CURVE SMOOTH",
+"505 612 OFFCURVE",
+"376 580 OFFCURVE",
+"257 479 CURVE",
+"236 461 LINE",
+"168 396 OFFCURVE",
+"105 321 OFFCURVE",
+"-9 170 CURVE",
+"45 134 LINE",
+"91 198 LINE",
+"109 208 LINE",
+"164 287 OFFCURVE",
+"219 356 OFFCURVE",
+"274 410 CURVE",
+"285 419 LINE",
+"373 500 OFFCURVE",
+"497 541 OFFCURVE",
+"613 541 CURVE SMOOTH",
+"669 541 OFFCURVE",
+"724 525 OFFCURVE",
+"743 513 CURVE"
+);
+},
+{
+closed = 1;
+nodes = (
+"71 592 OFFCURVE",
+"3 542 OFFCURVE",
+"3 443 CURVE SMOOTH",
+"3 437 OFFCURVE",
+"3 431 OFFCURVE",
+"4 425 CURVE",
+"76 425 LINE",
+"75 430 OFFCURVE",
+"75 435 OFFCURVE",
+"75 441 CURVE SMOOTH",
+"75 502 OFFCURVE",
+"114 526 OFFCURVE",
+"156 526 CURVE SMOOTH",
+"202 526 OFFCURVE",
+"231 495 OFFCURVE",
+"231 451 CURVE SMOOTH",
+"231 430 OFFCURVE",
+"226 412 OFFCURVE",
+"222 398 CURVE",
+"280 434 LINE",
+"284 446 OFFCURVE",
+"285 458 OFFCURVE",
+"285 470 CURVE SMOOTH",
+"285 532 OFFCURVE",
+"237 592 OFFCURVE",
+"144 592 CURVE SMOOTH"
+);
+}
+);
+width = 822;
+},
+{
+layerId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
+paths = (
+{
+closed = 1;
+nodes = (
+"683 -11 OFFCURVE",
+"738 88 OFFCURVE",
+"738 214 CURVE SMOOTH",
+"738 344 OFFCURVE",
+"659 436 OFFCURVE",
+"477 436 CURVE SMOOTH",
+"406 436 OFFCURVE",
+"324 403 OFFCURVE",
+"270 372 CURVE",
+"198 297 LINE",
+"277 314 OFFCURVE",
+"339 338 OFFCURVE",
+"404 338 CURVE SMOOTH",
+"561 338 OFFCURVE",
+"599 284 OFFCURVE",
+"599 216 CURVE SMOOTH",
+"599 175 OFFCURVE",
+"587 137 OFFCURVE",
+"540 137 CURVE SMOOTH",
+"481 137 OFFCURVE",
+"466 178 OFFCURVE",
+"466 255 CURVE SMOOTH",
+"466 263 LINE",
+"341 263 LINE",
+"341 250 LINE SMOOTH",
+"341 172 OFFCURVE",
+"322 137 OFFCURVE",
+"279 137 CURVE SMOOTH",
+"244 137 OFFCURVE",
+"217 165 OFFCURVE",
+"217 203 CURVE SMOOTH",
+"217 235 OFFCURVE",
+"220 257 OFFCURVE",
+"221 263 CURVE",
+"147 261 LINE",
+"136 232 OFFCURVE",
+"122 193 OFFCURVE",
+"122 135 CURVE SMOOTH",
+"122 69 OFFCURVE",
+"159 -11 OFFCURVE",
+"274 -11 CURVE SMOOTH",
+"348 -11 OFFCURVE",
+"391 24 OFFCURVE",
+"404 101 CURVE",
+"416 24 OFFCURVE",
+"467 -11 OFFCURVE",
+"565 -11 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"843 575 LINE",
+"792 605 OFFCURVE",
+"728 622 OFFCURVE",
+"653 622 CURVE SMOOTH",
+"508 622 OFFCURVE",
+"409 578 OFFCURVE",
+"302 478 CURVE",
+"276 467 LINE",
+"204 407 OFFCURVE",
+"85 277 OFFCURVE",
+"-2 175 CURVE",
+"85 99 LINE",
+"139 157 LINE",
+"169 195 LINE",
+"222 257 OFFCURVE",
+"266 305 OFFCURVE",
+"350 368 CURVE",
+"384 409 LINE",
+"446 448 OFFCURVE",
+"524 490 OFFCURVE",
+"633 490 CURVE SMOOTH",
+"680 490 OFFCURVE",
+"720 480 OFFCURVE",
+"752 463 CURVE"
+);
+},
+{
+closed = 1;
+nodes = (
+"87 610 OFFCURVE",
+"38 520 OFFCURVE",
+"38 437 CURVE SMOOTH",
+"38 432 OFFCURVE",
+"38 427 OFFCURVE",
+"38 422 CURVE",
+"178 422 LINE",
+"178 426 OFFCURVE",
+"178 430 OFFCURVE",
+"178 434 CURVE SMOOTH",
+"178 463 OFFCURVE",
+"198 491 OFFCURVE",
+"225 491 CURVE SMOOTH",
+"249 491 OFFCURVE",
+"263 473 OFFCURVE",
+"263 457 CURVE SMOOTH",
+"263 444 OFFCURVE",
+"260 431 OFFCURVE",
+"248 416 CURVE",
+"341 430 LINE",
+"353 455 OFFCURVE",
+"356 478 OFFCURVE",
+"356 499 CURVE SMOOTH",
+"354 565 OFFCURVE",
+"291 610 OFFCURVE",
+"202 610 CURVE SMOOTH"
+);
+}
+);
+width = 843;
+},
+{
+layerId = "CF8E177F-0CDC-40C1-8828-F158AA64F32E";
+width = 600;
+},
+{
+layerId = "56AEB5FB-BA14-4784-B08F-18006463EEDB";
+width = 600;
+},
+{
+layerId = "DC607D84-584B-45E6-A9EB-D1AF471CA2AE";
+width = 600;
+}
+);
+}
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/bhasinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/bhasinh.glyph
index 7fad26f9..0c8b644c 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/bhasinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/bhasinh.glyph
@@ -146,7 +146,7 @@ position = "{401, 533}";
 },
 {
 name = uvowel;
-position = "{931, 176}";
+position = "{861, 176}";
 },
 {
 name = virama;
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/chasinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/chasinh.glyph
index 18fda45c..2fa072d9 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/chasinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/chasinh.glyph
@@ -133,7 +133,7 @@ width = 798;
 anchors = (
 {
 name = uvowel;
-position = "{748.956, 176}";
+position = "{731, 176}";
 },
 {
 name = virama;
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/darasinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/darasinh.glyph
index 4e027c2a..b2246e3e 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/darasinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/darasinh.glyph
@@ -14,8 +14,8 @@ paths = (
 {
 closed = 1;
 nodes = (
-"473 -246 OFFCURVE",
-"535 -111 OFFCURVE",
+"473 -256 OFFCURVE",
+"535 -121 OFFCURVE",
 "535 -5 CURVE SMOOTH",
 "535 10 OFFCURVE",
 "533 38 OFFCURVE",
@@ -24,22 +24,22 @@ nodes = (
 "506 33 OFFCURVE",
 "509 27 OFFCURVE",
 "509 1 CURVE SMOOTH",
-"509 -101 OFFCURVE",
-"453 -220 OFFCURVE",
-"290 -220 CURVE SMOOTH",
-"154 -220 OFFCURVE",
-"80 -154 OFFCURVE",
-"80 -43 CURVE SMOOTH",
-"80 -41 OFFCURVE",
-"80 -34 OFFCURVE",
-"81 -30 CURVE",
-"54 -30 LINE",
-"53 -36 OFFCURVE",
-"53 -47 OFFCURVE",
-"53 -51 CURVE SMOOTH",
-"53 -159 OFFCURVE",
-"132 -246 OFFCURVE",
-"288 -246 CURVE SMOOTH"
+"509 -111 OFFCURVE",
+"453 -230 OFFCURVE",
+"290 -230 CURVE SMOOTH",
+"154 -230 OFFCURVE",
+"80 -164 OFFCURVE",
+"80 -53 CURVE SMOOTH",
+"80 -51 OFFCURVE",
+"80 -44 OFFCURVE",
+"81 -40 CURVE",
+"54 -40 LINE",
+"53 -46 OFFCURVE",
+"53 -57 OFFCURVE",
+"53 -61 CURVE SMOOTH",
+"53 -169 OFFCURVE",
+"132 -256 OFFCURVE",
+"288 -256 CURVE SMOOTH"
 );
 },
 {
@@ -49,9 +49,9 @@ nodes = (
 "41 389 OFFCURVE",
 "41 202 CURVE SMOOTH",
 "41 79 OFFCURVE",
-"150 -11 OFFCURVE",
-"328 -11 CURVE SMOOTH",
-"405 -11 OFFCURVE",
+"150 -21 OFFCURVE",
+"328 -21 CURVE SMOOTH",
+"405 -21 OFFCURVE",
 "462 -5 OFFCURVE",
 "528 31 CURVE",
 "528 51 LINE",
@@ -106,8 +106,8 @@ paths = (
 {
 closed = 1;
 nodes = (
-"506 -259 OFFCURVE",
-"567 -119 OFFCURVE",
+"506 -267 OFFCURVE",
+"567 -127 OFFCURVE",
 "567 -5 CURVE SMOOTH",
 "567 29 OFFCURVE",
 "564 67 OFFCURVE",
@@ -116,22 +116,22 @@ nodes = (
 "492 38 OFFCURVE",
 "502 33 OFFCURVE",
 "502 -7 CURVE SMOOTH",
-"502 -89 OFFCURVE",
-"452 -188 OFFCURVE",
-"313 -188 CURVE SMOOTH",
-"166 -188 OFFCURVE",
-"123 -122 OFFCURVE",
-"123 -54 CURVE SMOOTH",
-"123 -53 OFFCURVE",
-"123 -52 OFFCURVE",
-"123 -51 CURVE",
-"51 -51 LINE",
-"50 -56 OFFCURVE",
-"50 -63 OFFCURVE",
-"50 -66 CURVE SMOOTH",
-"50 -150 OFFCURVE",
-"112 -259 OFFCURVE",
-"313 -259 CURVE SMOOTH"
+"502 -97 OFFCURVE",
+"452 -196 OFFCURVE",
+"313 -196 CURVE SMOOTH",
+"166 -196 OFFCURVE",
+"123 -130 OFFCURVE",
+"123 -62 CURVE SMOOTH",
+"123 -61 OFFCURVE",
+"123 -60 OFFCURVE",
+"123 -59 CURVE",
+"51 -59 LINE",
+"50 -64 OFFCURVE",
+"50 -71 OFFCURVE",
+"50 -74 CURVE SMOOTH",
+"50 -158 OFFCURVE",
+"112 -267 OFFCURVE",
+"313 -267 CURVE SMOOTH"
 );
 },
 {
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/duvowelsinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/duvowelsinh.glyph
index 8a8e5d17..99c83e35 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/duvowelsinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/duvowelsinh.glyph
@@ -8,80 +8,77 @@ paths = (
 {
 closed = 1;
 nodes = (
-"40 -183 OFFCURVE",
-"49 -203 OFFCURVE",
-"63 -218 CURVE SMOOTH",
-"92 -248 OFFCURVE",
-"135 -257 OFFCURVE",
-"213 -257 CURVE SMOOTH",
-"497 -257 LINE",
-"497 36 LINE",
-"483 49 LINE",
-"427 25 OFFCURVE",
-"387 15 OFFCURVE",
-"319 15 CURVE SMOOTH",
-"157 15 OFFCURVE",
-"67 90 OFFCURVE",
-"67 232 CURVE SMOOTH",
-"67 307 OFFCURVE",
-"94 357 OFFCURVE",
-"142 387 CURVE SMOOTH",
-"190 418 OFFCURVE",
-"252 429 OFFCURVE",
-"368 429 CURVE SMOOTH",
-"497 429 LINE",
-"497 445 LINE SMOOTH",
-"497 545 OFFCURVE",
-"444 612 OFFCURVE",
-"342 612 CURVE SMOOTH",
-"258 612 OFFCURVE",
-"212 568 OFFCURVE",
-"212 500 CURVE SMOOTH",
-"212 492 OFFCURVE",
-"212 481 OFFCURVE",
-"214 470 CURVE",
-"241 473 LINE",
-"240 480 OFFCURVE",
-"239 489 OFFCURVE",
-"239 498 CURVE SMOOTH",
-"239 556 OFFCURVE",
-"276 586 OFFCURVE",
-"342 586 CURVE SMOOTH",
-"418 586 OFFCURVE",
-"468 540 OFFCURVE",
-"471 455 CURVE",
-"353 455 LINE SMOOTH",
-"236 455 OFFCURVE",
-"174 441 OFFCURVE",
-"120 404 CURVE SMOOTH",
-"70 370 OFFCURVE",
-"40 314 OFFCURVE",
-"40 232 CURVE SMOOTH",
-"40 79 OFFCURVE",
-"139 -11 OFFCURVE",
-"317 -11 CURVE SMOOTH",
-"388 -11 OFFCURVE",
-"426 -1 OFFCURVE",
-"471 16 CURVE",
-"471 -231 LINE",
-"232 -231 LINE SMOOTH",
-"146 -231 OFFCURVE",
-"106 -225 OFFCURVE",
-"82 -199 CURVE SMOOTH",
-"73 -189 OFFCURVE",
-"67 -175 OFFCURVE",
-"67 -156 CURVE SMOOTH",
-"67 -125 OFFCURVE",
-"80 -103 OFFCURVE",
-"116 -71 CURVE",
-"97 -53 LINE",
-"61 -86 OFFCURVE",
-"40 -115 OFFCURVE",
-"40 -155 CURVE SMOOTH"
+"208 413 OFFCURVE",
+"41 389 OFFCURVE",
+"41 202 CURVE SMOOTH",
+"41 79 OFFCURVE",
+"150 -11 OFFCURVE",
+"328 -11 CURVE SMOOTH",
+"416 -11 OFFCURVE",
+"482 18 OFFCURVE",
+"528 54 CURVE",
+"528 69 LINE",
+"504 69 LINE",
+"479 47 OFFCURVE",
+"417 15 OFFCURVE",
+"330 15 CURVE SMOOTH",
+"168 15 OFFCURVE",
+"68 90 OFFCURVE",
+"68 202 CURVE SMOOTH",
+"68 368 OFFCURVE",
+"212 387 OFFCURVE",
+"349 387 CURVE SMOOTH",
+"508 387 LINE",
+"508 423 LINE SMOOTH",
+"508 519 OFFCURVE",
+"459 612 OFFCURVE",
+"321 612 CURVE SMOOTH",
+"219 612 OFFCURVE",
+"160 552 OFFCURVE",
+"160 484 CURVE SMOOTH",
+"160 472 OFFCURVE",
+"161 463 OFFCURVE",
+"163 452 CURVE",
+"190 452 LINE",
+"188 463 OFFCURVE",
+"187 473 OFFCURVE",
+"187 482 CURVE SMOOTH",
+"187 540 OFFCURVE",
+"232 586 OFFCURVE",
+"325 586 CURVE SMOOTH",
+"437 586 OFFCURVE",
+"482 515 OFFCURVE",
+"482 417 CURVE SMOOTH",
+"482 405 LINE",
+"499 413 LINE",
+"349 413 LINE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"58 -230 OFFCURVE",
+"83 -257 OFFCURVE",
+"161 -257 CURVE SMOOTH",
+"529 -257 LINE",
+"529 69 LINE",
+"503 69 LINE",
+"503 -231 LINE",
+"160 -231 LINE SMOOTH",
+"123 -231 OFFCURVE",
+"83 -222 OFFCURVE",
+"83 -178 CURVE SMOOTH",
+"83 -155 OFFCURVE",
+"92 -131 OFFCURVE",
+"101 -121 CURVE",
+"77 -121 LINE",
+"67 -134 OFFCURVE",
+"58 -155 OFFCURVE",
+"58 -185 CURVE SMOOTH"
 );
 }
 );
-width = 538;
+width = 570;
 },
 {
 layerId = UUID0;
@@ -89,80 +86,77 @@ paths = (
 {
 closed = 1;
 nodes = (
-"36 -175 OFFCURVE",
-"49 -203 OFFCURVE",
-"72 -223 CURVE SMOOTH",
-"99 -246 OFFCURVE",
-"144 -261 OFFCURVE",
-"231 -261 CURVE SMOOTH",
-"549 -261 LINE",
-"549 67 LINE",
-"518 90 LINE",
-"466 70 OFFCURVE",
-"415 60 OFFCURVE",
-"353 60 CURVE SMOOTH",
-"175 60 OFFCURVE",
-"113 142 OFFCURVE",
-"113 229 CURVE SMOOTH",
-"113 286 OFFCURVE",
-"133 328 OFFCURVE",
-"171 352 CURVE SMOOTH",
-"211 377 OFFCURVE",
-"253 389 OFFCURVE",
-"385 389 CURVE SMOOTH",
-"548 389 LINE",
-"548 430 LINE SMOOTH",
-"548 549 OFFCURVE",
-"486 612 OFFCURVE",
-"376 612 CURVE SMOOTH",
-"284 612 OFFCURVE",
-"229 572 OFFCURVE",
-"229 499 CURVE SMOOTH",
-"229 488 OFFCURVE",
-"230 478 OFFCURVE",
-"231 468 CURVE",
-"303 477 LINE",
-"302 481 OFFCURVE",
-"302 487 OFFCURVE",
-"302 492 CURVE SMOOTH",
-"302 525 OFFCURVE",
-"329 546 OFFCURVE",
-"381 546 CURVE SMOOTH",
-"434 546 OFFCURVE",
-"473 517 OFFCURVE",
-"477 455 CURVE",
-"377 455 LINE SMOOTH",
-"255 455 OFFCURVE",
-"196 445 OFFCURVE",
-"141 415 CURVE SMOOTH",
-"78 381 OFFCURVE",
-"37 321 OFFCURVE",
-"37 233 CURVE SMOOTH",
-"37 72 OFFCURVE",
-"160 -11 OFFCURVE",
-"345 -11 CURVE SMOOTH",
-"386 -11 OFFCURVE",
-"431 -8 OFFCURVE",
-"477 5 CURVE",
-"477 -193 LINE",
-"261 -193 LINE SMOOTH",
-"176 -193 OFFCURVE",
-"151 -189 OFFCURVE",
-"132 -177 CURVE SMOOTH",
-"117 -168 OFFCURVE",
-"109 -154 OFFCURVE",
-"109 -137 CURVE SMOOTH",
-"109 -117 OFFCURVE",
-"121 -97 OFFCURVE",
-"147 -78 CURVE",
-"98 -27 LINE",
-"59 -61 OFFCURVE",
-"36 -95 OFFCURVE",
-"36 -140 CURVE SMOOTH"
+"192 425 OFFCURVE",
+"36 377 OFFCURVE",
+"36 203 CURVE SMOOTH",
+"36 42 OFFCURVE",
+"179 -11 OFFCURVE",
+"324 -11 CURVE SMOOTH",
+"413 -11 OFFCURVE",
+"472 15 OFFCURVE",
+"549 64 CURVE",
+"556 101 LINE",
+"488 101 LINE",
+"449 71 OFFCURVE",
+"395 60 OFFCURVE",
+"332 60 CURVE SMOOTH",
+"194 60 OFFCURVE",
+"112 112 OFFCURVE",
+"112 199 CURVE SMOOTH",
+"112 332 OFFCURVE",
+"227 359 OFFCURVE",
+"384 359 CURVE SMOOTH",
+"549 359 LINE",
+"549 425 LINE SMOOTH",
+"549 510 OFFCURVE",
+"480 612 OFFCURVE",
+"353 612 CURVE SMOOTH",
+"239 612 OFFCURVE",
+"167 547 OFFCURVE",
+"167 462 CURVE SMOOTH",
+"167 460 OFFCURVE",
+"167 460 OFFCURVE",
+"167 458 CURVE",
+"241 458 LINE",
+"241 460 OFFCURVE",
+"241 460 OFFCURVE",
+"241 462 CURVE SMOOTH",
+"241 500 OFFCURVE",
+"271 546 OFFCURVE",
+"353 546 CURVE SMOOTH",
+"440 546 OFFCURVE",
+"476 485 OFFCURVE",
+"476 426 CURVE SMOOTH",
+"476 412 LINE",
+"500 425 LINE",
+"376 425 LINE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"77 -212 OFFCURVE",
+"111 -261 OFFCURVE",
+"218 -261 CURVE SMOOTH",
+"551 -261 LINE",
+"556 101 LINE",
+"488 101 LINE",
+"483 -193 LINE",
+"236 -193 LINE SMOOTH",
+"166 -193 OFFCURVE",
+"140 -171 OFFCURVE",
+"140 -142 CURVE SMOOTH",
+"140 -125 OFFCURVE",
+"146 -106 OFFCURVE",
+"155 -87 CURVE",
+"95 -87 LINE",
+"82 -107 OFFCURVE",
+"77 -135 OFFCURVE",
+"77 -163 CURVE SMOOTH"
 );
 }
 );
-width = 585;
+width = 592;
 },
 {
 layerId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
@@ -170,71 +164,77 @@ paths = (
 {
 closed = 1;
 nodes = (
-"457 -11 OFFCURVE",
-"564 53 OFFCURVE",
-"625 99 CURVE",
-"625 162 LINE",
-"590 162 OFFCURVE",
-"531 162 OFFCURVE",
-"489 162 CURVE",
-"477 140 OFFCURVE",
-"427 129 OFFCURVE",
-"389 129 CURVE SMOOTH",
-"254 129 OFFCURVE",
-"194 154 OFFCURVE",
-"194 229 CURVE SMOOTH",
-"194 326 OFFCURVE",
-"286 330 OFFCURVE",
-"321 330 CURVE SMOOTH",
-"607 330 LINE",
-"607 439 LINE SMOOTH",
-"607 514 OFFCURVE",
-"554 622 OFFCURVE",
-"401 622 CURVE SMOOTH",
-"296 622 OFFCURVE",
-"229 582 OFFCURVE",
-"229 491 CURVE SMOOTH",
-"229 483 OFFCURVE",
-"229 487 OFFCURVE",
-"231 475 CURVE",
-"375 475 LINE",
-"375 494 OFFCURVE",
-"396 501 OFFCURVE",
-"415 501 CURVE SMOOTH",
-"449 501 OFFCURVE",
-"474 479 OFFCURVE",
-"471 445 CURVE",
-"275 445 LINE SMOOTH",
-"167 445 OFFCURVE",
-"16 400 OFFCURVE",
-"16 224 CURVE SMOOTH",
-"16 72 OFFCURVE",
-"127 -11 OFFCURVE",
-"331 -11 CURVE SMOOTH"
+"171 444 OFFCURVE",
+"20 400 OFFCURVE",
+"20 216 CURVE SMOOTH",
+"20 72 OFFCURVE",
+"131 -21 OFFCURVE",
+"348 -21 CURVE SMOOTH",
+"462 -21 OFFCURVE",
+"532 25 OFFCURVE",
+"612 84 CURVE",
+"602 152 LINE",
+"488 155 LINE",
+"464 133 OFFCURVE",
+"428 106 OFFCURVE",
+"360 106 CURVE SMOOTH",
+"268 106 OFFCURVE",
+"198 154 OFFCURVE",
+"198 220 CURVE SMOOTH",
+"198 316 OFFCURVE",
+"290 323 OFFCURVE",
+"365 323 CURVE SMOOTH",
+"611 323 LINE",
+"611 401 LINE SMOOTH",
+"611 542 OFFCURVE",
+"519 626 OFFCURVE",
+"359 626 CURVE SMOOTH",
+"225 626 OFFCURVE",
+"143 564 OFFCURVE",
+"143 488 CURVE SMOOTH",
+"143 480 OFFCURVE",
+"143 476 OFFCURVE",
+"145 463 CURVE",
+"318 463 LINE",
+"318 464 OFFCURVE",
+"318 465 OFFCURVE",
+"318 466 CURVE SMOOTH",
+"318 489 OFFCURVE",
+"344 501 OFFCURVE",
+"378 501 CURVE SMOOTH",
+"453 501 OFFCURVE",
+"468 451 OFFCURVE",
+"468 424 CURVE SMOOTH",
+"468 400 LINE",
+"538 444 LINE",
+"319 444 LINE SMOOTH"
 );
 },
 {
 closed = 1;
 nodes = (
-"31 -244 OFFCURVE",
-"117 -291 OFFCURVE",
-"209 -291 CURVE SMOOTH",
-"625 -291 LINE",
-"625 147 LINE",
-"495 147 LINE",
-"495 -157 LINE",
-"260 -157 LINE SMOOTH",
-"190 -157 OFFCURVE",
-"148 -140 OFFCURVE",
-"180 -52 CURVE",
-"49 -51 LINE",
-"32 -96 OFFCURVE",
-"31 -129 OFFCURVE",
-"31 -150 CURVE SMOOTH"
+"46 -254 OFFCURVE",
+"132 -291 OFFCURVE",
+"224 -291 CURVE SMOOTH",
+"615 -291 LINE",
+"615 155 LINE",
+"488 155 LINE",
+"488 -167 LINE",
+"266 -167 LINE SMOOTH",
+"224 -167 OFFCURVE",
+"184 -157 OFFCURVE",
+"184 -113 CURVE SMOOTH",
+"184 -99 OFFCURVE",
+"186 -83 OFFCURVE",
+"192 -62 CURVE",
+"64 -61 LINE",
+"47 -106 OFFCURVE",
+"46 -139 OFFCURVE",
+"46 -160 CURVE SMOOTH"
 );
 }
 );
-width = 645;
+width = 635;
 },
 {
 associatedMasterId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/fasinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/fasinh.glyph
index 302fe1a3..fc783dd1 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/fasinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/fasinh.glyph
@@ -89,7 +89,7 @@ position = "{248, 583}";
 },
 {
 name = uvowel;
-position = "{786.668, 176}";
+position = "{764, 176}";
 },
 {
 name = virama;
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/ghasinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/ghasinh.glyph
index 676d3ee2..0e3153b5 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/ghasinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/ghasinh.glyph
@@ -172,7 +172,7 @@ position = "{234, 583}";
 },
 {
 name = uvowel;
-position = "{749, 176}";
+position = "{788, 176}";
 },
 {
 name = virama;
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/hasinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/hasinh.glyph
index 24277735..38e0f630 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/hasinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/hasinh.glyph
@@ -132,7 +132,7 @@ position = "{327, 583}";
 },
 {
 name = uvowel;
-position = "{939, 176}";
+position = "{879, 176}";
 },
 {
 name = virama;
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/jhasinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/jhasinh.glyph
index 6df5f1d3..d4c54a50 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/jhasinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/jhasinh.glyph
@@ -180,6 +180,12 @@ name = uvowel;
 position = "{1359, 176}";
 }
 );
+components = (
+{
+name = dhasinh;
+transform = "{1, 0, 0, 1, 600, 0}";
+}
+);
 layerId = UUID0;
 paths = (
 {
@@ -287,62 +293,9 @@ nodes = (
 "255 592 OFFCURVE",
 "157 592 CURVE SMOOTH"
 );
-},
-{
-closed = 1;
-nodes = (
-"1284 -11 OFFCURVE",
-"1384 83 OFFCURVE",
-"1384 348 CURVE SMOOTH",
-"1384 684 OFFCURVE",
-"1224 836 OFFCURVE",
-"969 836 CURVE SMOOTH",
-"831 836 OFFCURVE",
-"731 803 OFFCURVE",
-"637 751 CURVE",
-"670 686 LINE",
-"755 738 OFFCURVE",
-"840 766 OFFCURVE",
-"965 766 CURVE SMOOTH",
-"1194 766 OFFCURVE",
-"1309 620 OFFCURVE",
-"1309 345 CURVE SMOOTH",
-"1309 130 OFFCURVE",
-"1238 60 OFFCURVE",
-"1144 60 CURVE SMOOTH",
-"1052 60 OFFCURVE",
-"1022 122 OFFCURVE",
-"1022 208 CURVE SMOOTH",
-"1022 214 LINE",
-"955 214 LINE",
-"955 208 LINE SMOOTH",
-"955 119 OFFCURVE",
-"922 60 OFFCURVE",
-"830 60 CURVE SMOOTH",
-"747 60 OFFCURVE",
-"702 119 OFFCURVE",
-"702 220 CURVE SMOOTH",
-"702 334 OFFCURVE",
-"773 411 OFFCURVE",
-"895 417 CURVE",
-"921 491 LINE",
-"886 479 LINE",
-"708 474 OFFCURVE",
-"640 354 OFFCURVE",
-"640 226 CURVE SMOOTH",
-"640 64 OFFCURVE",
-"718 -11 OFFCURVE",
-"823 -11 CURVE SMOOTH",
-"909 -11 OFFCURVE",
-"949 22 OFFCURVE",
-"988 77 CURVE",
-"1022 29 OFFCURVE",
-"1066 -11 OFFCURVE",
-"1145 -11 CURVE SMOOTH"
-);
 }
 );
-width = 1420;
+width = 1467;
 },
 {
 anchors = (
@@ -1240,6 +1193,185 @@ nodes = (
 }
 );
 width = 1179;
+},
+{
+anchors = (
+{
+name = uvowel;
+position = "{1359, 176}";
+}
+);
+associatedMasterId = UUID0;
+components = (
+{
+name = _part.ka;
+transform = "{1, 0, 0, 1, 20, 0}";
+}
+);
+layerId = "54DD7E41-69E5-4ED0-8605-147108EE17A6";
+name = "29 Dec 24 at 17:21";
+paths = (
+{
+closed = 1;
+nodes = (
+"643 -11 OFFCURVE",
+"689 89 OFFCURVE",
+"689 192 CURVE SMOOTH",
+"689 361 OFFCURVE",
+"588 449 OFFCURVE",
+"424 449 CURVE SMOOTH",
+"350 449 OFFCURVE",
+"298 432 OFFCURVE",
+"273 415 CURVE",
+"176 334 LINE",
+"270 372 OFFCURVE",
+"318 380 OFFCURVE",
+"410 380 CURVE SMOOTH",
+"558 380 OFFCURVE",
+"630 309 OFFCURVE",
+"630 191 CURVE SMOOTH",
+"630 119 OFFCURVE",
+"605 60 OFFCURVE",
+"527 60 CURVE SMOOTH",
+"458 60 OFFCURVE",
+"422 120 OFFCURVE",
+"422 204 CURVE SMOOTH",
+"422 214 LINE",
+"355 214 LINE",
+"355 208 LINE SMOOTH",
+"355 107 OFFCURVE",
+"321 60 OFFCURVE",
+"253 60 CURVE SMOOTH",
+"172 60 OFFCURVE",
+"153 115 OFFCURVE",
+"153 187 CURVE SMOOTH",
+"153 196 OFFCURVE",
+"153 205 OFFCURVE",
+"155 214 CURVE",
+"93 214 LINE",
+"90 200 OFFCURVE",
+"88 184 OFFCURVE",
+"88 170 CURVE SMOOTH",
+"88 22 OFFCURVE",
+"182 -11 OFFCURVE",
+"248 -11 CURVE SMOOTH",
+"313 -11 OFFCURVE",
+"355 15 OFFCURVE",
+"388 77 CURVE",
+"416 27 OFFCURVE",
+"460 -11 OFFCURVE",
+"532 -11 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"711 544 OFFCURVE",
+"782 516 OFFCURVE",
+"878 444 CURVE",
+"921 491 LINE",
+"858 547 OFFCURVE",
+"760 612 OFFCURVE",
+"616 612 CURVE SMOOTH",
+"485 612 OFFCURVE",
+"386 583 OFFCURVE",
+"267 480 CURVE",
+"246 461 LINE",
+"174 396 OFFCURVE",
+"111 321 OFFCURVE",
+"11 180 CURVE",
+"75 144 LINE",
+"100 188 LINE",
+"119 208 LINE",
+"175 287 OFFCURVE",
+"229 356 OFFCURVE",
+"284 410 CURVE",
+"295 420 LINE",
+"383 501 OFFCURVE",
+"479 544 OFFCURVE",
+"612 544 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"76 592 OFFCURVE",
+"23 548 OFFCURVE",
+"23 467 CURVE SMOOTH",
+"23 444 OFFCURVE",
+"28 415 OFFCURVE",
+"36 389 CURVE",
+"106 403 LINE",
+"101 421 OFFCURVE",
+"95 437 OFFCURVE",
+"95 459 CURVE SMOOTH",
+"95 506 OFFCURVE",
+"121 526 OFFCURVE",
+"158 526 CURVE SMOOTH",
+"216 526 OFFCURVE",
+"234 465 OFFCURVE",
+"242 398 CURVE",
+"300 434 LINE",
+"293 509 OFFCURVE",
+"255 592 OFFCURVE",
+"157 592 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"1284 -11 OFFCURVE",
+"1384 83 OFFCURVE",
+"1384 348 CURVE SMOOTH",
+"1384 684 OFFCURVE",
+"1224 836 OFFCURVE",
+"969 836 CURVE SMOOTH",
+"831 836 OFFCURVE",
+"731 803 OFFCURVE",
+"637 751 CURVE",
+"670 686 LINE",
+"755 738 OFFCURVE",
+"840 766 OFFCURVE",
+"965 766 CURVE SMOOTH",
+"1194 766 OFFCURVE",
+"1309 620 OFFCURVE",
+"1309 345 CURVE SMOOTH",
+"1309 130 OFFCURVE",
+"1238 60 OFFCURVE",
+"1144 60 CURVE SMOOTH",
+"1052 60 OFFCURVE",
+"1022 122 OFFCURVE",
+"1022 208 CURVE SMOOTH",
+"1022 214 LINE",
+"955 214 LINE",
+"955 208 LINE SMOOTH",
+"955 119 OFFCURVE",
+"922 60 OFFCURVE",
+"830 60 CURVE SMOOTH",
+"747 60 OFFCURVE",
+"702 119 OFFCURVE",
+"702 220 CURVE SMOOTH",
+"702 334 OFFCURVE",
+"773 411 OFFCURVE",
+"895 417 CURVE",
+"921 491 LINE",
+"886 479 LINE",
+"708 474 OFFCURVE",
+"640 354 OFFCURVE",
+"640 226 CURVE SMOOTH",
+"640 64 OFFCURVE",
+"718 -11 OFFCURVE",
+"823 -11 CURVE SMOOTH",
+"909 -11 OFFCURVE",
+"949 22 OFFCURVE",
+"988 77 CURVE",
+"1022 29 OFFCURVE",
+"1066 -11 OFFCURVE",
+"1145 -11 CURVE SMOOTH"
+);
+}
+);
+width = 1420;
 }
 );
 leftMetricsKey = kasinh;
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/jnyasinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/jnyasinh.glyph
index fb838ee5..3c42c902 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/jnyasinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/jnyasinh.glyph
@@ -367,35 +367,14 @@ name = virama;
 position = "{1161, 536}";
 }
 );
-layerId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
-paths = (
+components = (
 {
-closed = 1;
-nodes = (
-"28 141 OFFCURVE",
-"102 -5 OFFCURVE",
-"241 -5 CURVE",
-"241 38 OFFCURVE",
-"242 91 OFFCURVE",
-"242 133 CURVE",
-"200 134 OFFCURVE",
-"168 197 OFFCURVE",
-"168 290 CURVE",
-"168 393 OFFCURVE",
-"193 510 OFFCURVE",
-"292 510 CURVE SMOOTH",
-"322 510 OFFCURVE",
-"382 484 OFFCURVE",
-"432 453 CURVE",
-"493 543 LINE",
-"463 569 OFFCURVE",
-"382 622 OFFCURVE",
-"297 622 CURVE SMOOTH",
-"120 622 OFFCURVE",
-"28 494 OFFCURVE",
-"28 291 CURVE SMOOTH"
+name = dasinh;
+transform = "{1, 0, 0, 1, 710, 0}";
+}
 );
-},
+layerId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
+paths = (
 {
 closed = 1;
 nodes = (
@@ -458,74 +437,30 @@ nodes = (
 {
 closed = 1;
 nodes = (
-"1149 -11 OFFCURVE",
-"1221 2 OFFCURVE",
-"1296 31 CURVE",
-"1264 162 LINE",
-"1194 140 OFFCURVE",
-"1138 129 OFFCURVE",
-"1060 129 CURVE SMOOTH",
-"925 129 OFFCURVE",
-"865 154 OFFCURVE",
-"865 229 CURVE SMOOTH",
-"865 326 OFFCURVE",
-"957 330 OFFCURVE",
-"992 330 CURVE SMOOTH",
-"1278 330 LINE",
-"1278 439 LINE SMOOTH",
-"1278 514 OFFCURVE",
-"1225 622 OFFCURVE",
-"1072 622 CURVE SMOOTH",
-"967 622 OFFCURVE",
-"900 582 OFFCURVE",
-"900 491 CURVE SMOOTH",
-"900 483 OFFCURVE",
-"900 487 OFFCURVE",
-"902 475 CURVE",
-"1046 475 LINE",
-"1046 494 OFFCURVE",
-"1067 501 OFFCURVE",
-"1086 501 CURVE SMOOTH",
-"1120 501 OFFCURVE",
-"1145 479 OFFCURVE",
-"1142 445 CURVE",
-"946 445 LINE SMOOTH",
-"838 445 OFFCURVE",
-"742 399 OFFCURVE",
-"742 223 CURVE SMOOTH",
-"742 71 OFFCURVE",
-"798 -11 OFFCURVE",
-"1025 -11 CURVE SMOOTH"
-);
-},
-{
-closed = 1;
-nodes = (
-"1222 -271 OFFCURVE",
-"1275 -262 OFFCURVE",
-"1317 -248 CURVE",
-"1280 -126 LINE",
-"1255 -135 OFFCURVE",
-"1224 -140 OFFCURVE",
-"1202 -140 CURVE SMOOTH",
-"1165 -140 OFFCURVE",
-"1141 -123 OFFCURVE",
-"1141 -90 CURVE SMOOTH",
-"1141 -48 OFFCURVE",
-"1180 -7 OFFCURVE",
-"1255 18 CURVE",
-"1238 61 LINE",
-"1180 46 LINE",
-"1035 -7 OFFCURVE",
-"985 -50 OFFCURVE",
-"985 -126 CURVE SMOOTH",
-"985 -211 OFFCURVE",
-"1050 -271 OFFCURVE",
-"1172 -271 CURVE SMOOTH"
+"0 164 OFFCURVE",
+"30 70 OFFCURVE",
+"83 0 CURVE",
+"219 38 LINE",
+"166 116 OFFCURVE",
+"140 188 OFFCURVE",
+"140 261 CURVE SMOOTH",
+"140 342 OFFCURVE",
+"181 518 OFFCURVE",
+"382 518 CURVE SMOOTH",
+"435 518 OFFCURVE",
+"467 514 OFFCURVE",
+"484 511 CURVE",
+"657 608 LINE",
+"610 630 OFFCURVE",
+"524 646 OFFCURVE",
+"448 646 CURVE SMOOTH",
+"132 646 OFFCURVE",
+"0 493 OFFCURVE",
+"0 262 CURVE SMOOTH"
 );
 }
 );
-width = 1284;
+width = 1345;
 },
 {
 anchors = (
@@ -1228,8 +1163,363 @@ nodes = (
 }
 );
 width = 1001;
+},
+{
+anchors = (
+{
+name = repaya;
+position = "{652.974, 730}";
+},
+{
+name = top;
+position = "{816, 533}";
+},
+{
+name = virama;
+position = "{1161, 536}";
+}
+);
+associatedMasterId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
+layerId = "50F5FF1D-3229-48EF-8A83-B2CF14ADC4A8";
+name = "29 Dec 24 at 17:23";
+paths = (
+{
+closed = 1;
+nodes = (
+"28 141 OFFCURVE",
+"102 -5 OFFCURVE",
+"241 -5 CURVE",
+"241 38 OFFCURVE",
+"242 91 OFFCURVE",
+"242 133 CURVE",
+"200 134 OFFCURVE",
+"168 197 OFFCURVE",
+"168 290 CURVE",
+"168 393 OFFCURVE",
+"193 510 OFFCURVE",
+"292 510 CURVE SMOOTH",
+"322 510 OFFCURVE",
+"382 484 OFFCURVE",
+"432 453 CURVE",
+"493 543 LINE",
+"463 569 OFFCURVE",
+"382 622 OFFCURVE",
+"297 622 CURVE SMOOTH",
+"120 622 OFFCURVE",
+"28 494 OFFCURVE",
+"28 291 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"735 -11 OFFCURVE",
+"865 98 OFFCURVE",
+"865 229 CURVE SMOOTH",
+"865 340 OFFCURVE",
+"766 371 OFFCURVE",
+"707 371 CURVE SMOOTH",
+"693 371 OFFCURVE",
+"656 363 OFFCURVE",
+"643 360 CURVE",
+"689 350 LINE",
+"702 412 OFFCURVE",
+"761 504 OFFCURVE",
+"843 504 CURVE SMOOTH",
+"878 504 OFFCURVE",
+"896 493 OFFCURVE",
+"902 475 CURVE",
+"957 475 OFFCURVE",
+"987 476 OFFCURVE",
+"1034 476 CURVE",
+"990 543 OFFCURVE",
+"964 622 OFFCURVE",
+"850 622 CURVE SMOOTH",
+"735 622 OFFCURVE",
+"592 563 OFFCURVE",
+"536 291 CURVE",
+"639 255 LINE",
+"641 268 OFFCURVE",
+"658 281 OFFCURVE",
+"681 281 CURVE SMOOTH",
+"712 281 OFFCURVE",
+"725 260 OFFCURVE",
+"725 235 CURVE SMOOTH",
+"725 184 OFFCURVE",
+"657 143 OFFCURVE",
+"564 143 CURVE SMOOTH",
+"462 143 OFFCURVE",
+"402 197 OFFCURVE",
+"402 308 CURVE SMOOTH",
+"402 415 OFFCURVE",
+"438 487 OFFCURVE",
+"559 487 CURVE SMOOTH",
+"579 487 OFFCURVE",
+"581 487 OFFCURVE",
+"592 486 CURVE",
+"599 620 LINE",
+"583 622 OFFCURVE",
+"578 622 OFFCURVE",
+"561 622 CURVE SMOOTH",
+"356 622 OFFCURVE",
+"233 507 OFFCURVE",
+"233 302 CURVE SMOOTH",
+"233 115 OFFCURVE",
+"340 -11 OFFCURVE",
+"550 -11 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"1149 -11 OFFCURVE",
+"1221 2 OFFCURVE",
+"1296 31 CURVE",
+"1264 162 LINE",
+"1194 140 OFFCURVE",
+"1138 129 OFFCURVE",
+"1060 129 CURVE SMOOTH",
+"925 129 OFFCURVE",
+"865 154 OFFCURVE",
+"865 229 CURVE SMOOTH",
+"865 326 OFFCURVE",
+"957 330 OFFCURVE",
+"992 330 CURVE SMOOTH",
+"1278 330 LINE",
+"1278 439 LINE SMOOTH",
+"1278 514 OFFCURVE",
+"1225 622 OFFCURVE",
+"1072 622 CURVE SMOOTH",
+"967 622 OFFCURVE",
+"900 582 OFFCURVE",
+"900 491 CURVE SMOOTH",
+"900 483 OFFCURVE",
+"900 487 OFFCURVE",
+"902 475 CURVE",
+"1046 475 LINE",
+"1046 494 OFFCURVE",
+"1067 501 OFFCURVE",
+"1086 501 CURVE SMOOTH",
+"1120 501 OFFCURVE",
+"1145 479 OFFCURVE",
+"1142 445 CURVE",
+"946 445 LINE SMOOTH",
+"838 445 OFFCURVE",
+"742 399 OFFCURVE",
+"742 223 CURVE SMOOTH",
+"742 71 OFFCURVE",
+"798 -11 OFFCURVE",
+"1025 -11 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"1222 -271 OFFCURVE",
+"1275 -262 OFFCURVE",
+"1317 -248 CURVE",
+"1280 -126 LINE",
+"1255 -135 OFFCURVE",
+"1224 -140 OFFCURVE",
+"1202 -140 CURVE SMOOTH",
+"1165 -140 OFFCURVE",
+"1141 -123 OFFCURVE",
+"1141 -90 CURVE SMOOTH",
+"1141 -48 OFFCURVE",
+"1180 -7 OFFCURVE",
+"1255 18 CURVE",
+"1238 61 LINE",
+"1180 46 LINE",
+"1035 -7 OFFCURVE",
+"985 -50 OFFCURVE",
+"985 -126 CURVE SMOOTH",
+"985 -211 OFFCURVE",
+"1050 -271 OFFCURVE",
+"1172 -271 CURVE SMOOTH"
+);
+}
+);
+width = 1284;
+},
+{
+anchors = (
+{
+name = repaya;
+position = "{595, 730}";
+},
+{
+name = top;
+position = "{674, 563}";
+},
+{
+name = virama;
+position = "{1057.921, 536}";
+}
+);
+associatedMasterId = UUID0;
+layerId = "2F008927-022C-4CDA-A64D-7D28419E087A";
+name = OLD;
+paths = (
+{
+closed = 1;
+nodes = (
+"647 -11 OFFCURVE",
+"719 98 OFFCURVE",
+"719 222 CURVE SMOOTH",
+"719 298 OFFCURVE",
+"687 358 OFFCURVE",
+"614 358 CURVE SMOOTH",
+"596 358 OFFCURVE",
+"570 353 OFFCURVE",
+"555 342 CURVE",
+"565 341 LINE",
+"607 495 OFFCURVE",
+"712 548 OFFCURVE",
+"825 548 CURVE SMOOTH",
+"837 548 OFFCURVE",
+"845 547 OFFCURVE",
+"848 545 CURVE",
+"943 600 LINE",
+"910 609 OFFCURVE",
+"866 612 OFFCURVE",
+"822 612 CURVE SMOOTH",
+"670 612 OFFCURVE",
+"524 532 OFFCURVE",
+"488 296 CURVE",
+"559 274 LINE",
+"575 287 OFFCURVE",
+"591 292 OFFCURVE",
+"608 292 CURVE SMOOTH",
+"637 292 OFFCURVE",
+"657 274 OFFCURVE",
+"657 223 CURVE SMOOTH",
+"657 129 OFFCURVE",
+"597 60 OFFCURVE",
+"475 60 CURVE SMOOTH",
+"329 60 OFFCURVE",
+"271 147 OFFCURVE",
+"271 268 CURVE SMOOTH",
+"271 411 OFFCURVE",
+"361 492 OFFCURVE",
+"497 497 CURVE",
+"523 566 LINE",
+"482 545 LINE",
+"317 545 OFFCURVE",
+"196 446 OFFCURVE",
+"196 273 CURVE SMOOTH",
+"196 102 OFFCURVE",
+"291 -11 OFFCURVE",
+"471 -11 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"38 218 OFFCURVE",
+"65 140 OFFCURVE",
+"97 83 CURVE",
+"163 116 LINE",
+"129 166 OFFCURVE",
+"111 234 OFFCURVE",
+"111 304 CURVE SMOOTH",
+"111 467 OFFCURVE",
+"223 548 OFFCURVE",
+"351 548 CURVE SMOOTH",
+"403 548 OFFCURVE",
+"442 544 OFFCURVE",
+"475 528 CURVE",
+"523 566 LINE",
+"476 594 OFFCURVE",
+"415 612 OFFCURVE",
+"351 612 CURVE SMOOTH",
+"170 612 OFFCURVE",
+"38 507 OFFCURVE",
+"38 308 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"1014 -11 OFFCURVE",
+"1089 -2 OFFCURVE",
+"1162 37 CURVE",
+"1141 104 LINE",
+"1079 73 OFFCURVE",
+"1021 60 OFFCURVE",
+"956 60 CURVE SMOOTH",
+"787 60 OFFCURVE",
+"728 142 OFFCURVE",
+"728 229 CURVE SMOOTH",
+"728 286 OFFCURVE",
+"748 328 OFFCURVE",
+"784 352 CURVE SMOOTH",
+"821 377 OFFCURVE",
+"861 389 OFFCURVE",
+"987 389 CURVE SMOOTH",
+"1140 389 LINE",
+"1140 430 LINE SMOOTH",
+"1140 549 OFFCURVE",
+"1078 612 OFFCURVE",
+"968 612 CURVE SMOOTH",
+"890 612 OFFCURVE",
+"821 576 OFFCURVE",
+"821 499 CURVE SMOOTH",
+"821 486 OFFCURVE",
+"822 478 OFFCURVE",
+"823 468 CURVE",
+"895 477 LINE",
+"894 481 OFFCURVE",
+"894 487 OFFCURVE",
+"894 492 CURVE SMOOTH",
+"894 525 OFFCURVE",
+"921 546 OFFCURVE",
+"974 546 CURVE SMOOTH",
+"1027 546 OFFCURVE",
+"1065 517 OFFCURVE",
+"1069 455 CURVE",
+"984 455 LINE SMOOTH",
+"871 455 OFFCURVE",
+"797 442 OFFCURVE",
+"739 401 CURVE SMOOTH",
+"691 367 OFFCURVE",
+"664 313 OFFCURVE",
+"664 233 CURVE SMOOTH",
+"664 72 OFFCURVE",
+"771 -11 OFFCURVE",
+"948 -11 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"1120 -271 OFFCURVE",
+"1152 -267 OFFCURVE",
+"1185 -252 CURVE",
+"1169 -188 LINE",
+"1148 -198 OFFCURVE",
+"1122 -203 OFFCURVE",
+"1098 -203 CURVE SMOOTH",
+"1035 -203 OFFCURVE",
+"1002 -175 OFFCURVE",
+"1002 -119 CURVE SMOOTH",
+"1002 -62 OFFCURVE",
+"1040 -10 OFFCURVE",
+"1106 28 CURVE",
+"1088 69 LINE",
+"1053 56 LINE",
+"976 13 OFFCURVE",
+"928 -47 OFFCURVE",
+"928 -121 CURVE SMOOTH",
+"928 -214 OFFCURVE",
+"983 -271 OFFCURVE",
+"1083 -271 CURVE SMOOTH"
+);
+}
+);
+width = 1170;
 }
 );
 rightKerningGroup = dasinh;
+rightMetricsKey = dasinh;
 unicode = 0DA5;
 }
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/kassasinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/kassasinh.glyph
index 147a84fb..76e68f1f 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/kassasinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/kassasinh.glyph
@@ -6,717 +6,72 @@ layers = (
 anchors = (
 {
 name = repaya;
-position = "{944.964, 730}";
+position = "{795, 730}";
 },
 {
 name = top;
-position = "{751.621, 533}";
+position = "{591, 533}";
 }
 );
-layerId = "7977A986-4EFB-4152-84F8-5A02CD382AAF";
-paths = (
-{
-closed = 1;
-nodes = (
-"604 -11 OFFCURVE",
-"645 74 OFFCURVE",
-"645 193 CURVE SMOOTH",
-"645 353 OFFCURVE",
-"553 448 OFFCURVE",
-"384 448 CURVE SMOOTH",
-"312 448 OFFCURVE",
-"258 431 OFFCURVE",
-"225 413 CURVE",
-"184 376 LINE",
-"261 410 OFFCURVE",
-"303 422 OFFCURVE",
-"383 422 CURVE SMOOTH",
-"538 422 OFFCURVE",
-"622 337 OFFCURVE",
-"622 193 CURVE SMOOTH",
-"622 106 OFFCURVE",
-"598 15 OFFCURVE",
-"489 15 CURVE SMOOTH",
-"415 15 OFFCURVE",
-"362 66 OFFCURVE",
-"362 166 CURVE SMOOTH",
-"362 204 LINE",
-"336 204 LINE",
-"336 166 LINE SMOOTH",
-"336 84 OFFCURVE",
-"300 15 OFFCURVE",
-"211 15 CURVE SMOOTH",
-"107 15 OFFCURVE",
-"91 101 OFFCURVE",
-"91 170 CURVE SMOOTH",
-"91 181 OFFCURVE",
-"92 191 OFFCURVE",
-"94 204 CURVE",
-"68 204 LINE",
-"66 196 OFFCURVE",
-"64 181 OFFCURVE",
-"64 170 CURVE SMOOTH",
-"64 21 OFFCURVE",
-"143 -11 OFFCURVE",
-"211 -11 CURVE SMOOTH",
-"276 -11 OFFCURVE",
-"325 19 OFFCURVE",
-"349 98 CURVE",
-"366 41 OFFCURVE",
-"406 -11 OFFCURVE",
-"492 -11 CURVE SMOOTH"
-);
-},
-{
-closed = 1;
-nodes = (
-"90 591 OFFCURVE",
-"46 548 OFFCURVE",
-"46 473 CURVE SMOOTH",
-"46 455 OFFCURVE",
-"50 421 OFFCURVE",
-"58 395 CURVE",
-"84 400 LINE",
-"78 421 OFFCURVE",
-"73 445 OFFCURVE",
-"73 473 CURVE SMOOTH",
-"73 538 OFFCURVE",
-"108 565 OFFCURVE",
-"154 565 CURVE SMOOTH",
-"211 565 OFFCURVE",
-"235 522 OFFCURVE",
-"253 458 CURVE",
-"275 470 LINE",
-"257 533 OFFCURVE",
-"228 591 OFFCURVE",
-"154 591 CURVE SMOOTH"
-);
-},
+components = (
 {
-closed = 1;
-nodes = (
-"639 586 OFFCURVE",
-"670 582 OFFCURVE",
-"700 574 CURVE",
-"734 591 LINE",
-"699 604 OFFCURVE",
-"657 612 OFFCURVE",
-"601 612 CURVE SMOOTH",
-"464 612 OFFCURVE",
-"373 571 OFFCURVE",
-"266 476 CURVE SMOOTH",
-"260 471 LINE SMOOTH",
-"184 395 OFFCURVE",
-"97 283 OFFCURVE",
-"18 171 CURVE",
-"42 156 LINE",
-"67 193 LINE",
-"74 202 LINE",
-"125 274 OFFCURVE",
-"177 343 OFFCURVE",
-"229 401 CURVE",
-"240 415 LINE",
-"364 544 OFFCURVE",
-"467 586 OFFCURVE",
-"600 586 CURVE SMOOTH"
-);
+name = _part.ka;
+transform = "{1, 0, 0, 1, 30, 0}";
 },
 {
-closed = 1;
-nodes = (
-"1174 -11 OFFCURVE",
-"1281 96 OFFCURVE",
-"1281 251 CURVE SMOOTH",
-"1281 385 OFFCURVE",
-"1203 455 OFFCURVE",
-"1023 455 CURVE SMOOTH",
-"988 455 LINE",
-"994 452 LINE",
-"997 539 OFFCURVE",
-"1046 586 OFFCURVE",
-"1121 586 CURVE SMOOTH",
-"1179 586 OFFCURVE",
-"1219 556 OFFCURVE",
-"1219 485 CURVE SMOOTH",
-"1219 453 OFFCURVE",
-"1212 426 OFFCURVE",
-"1200 405 CURVE",
-"1196 397 LINE",
-"1151 331 OFFCURVE",
-"1053 321 OFFCURVE",
-"987 321 CURVE SMOOTH",
-"913 321 LINE SMOOTH",
-"864 321 OFFCURVE",
-"827 314 OFFCURVE",
-"802 292 CURVE SMOOTH",
-"786 278 OFFCURVE",
-"776 257 OFFCURVE",
-"776 229 CURVE SMOOTH",
-"776 163 OFFCURVE",
-"830 125 OFFCURVE",
-"941 125 CURVE SMOOTH",
-"1081 125 OFFCURVE",
-"1115 179 OFFCURVE",
-"1115 234 CURVE SMOOTH",
-"1115 267 OFFCURVE",
-"1101 293 OFFCURVE",
-"1082 314 CURVE",
-"1057 304 LINE",
-"1076 287 OFFCURVE",
-"1088 261 OFFCURVE",
-"1088 235 CURVE SMOOTH",
-"1088 181 OFFCURVE",
-"1048 151 OFFCURVE",
-"942 151 CURVE SMOOTH",
-"850 151 OFFCURVE",
-"803 175 OFFCURVE",
-"803 230 CURVE SMOOTH",
-"803 269 OFFCURVE",
-"831 295 OFFCURVE",
-"904 295 CURVE SMOOTH",
-"988 295 LINE SMOOTH",
-"1092 295 OFFCURVE",
-"1175 319 OFFCURVE",
-"1218 385 CURVE SMOOTH",
-"1236 412 OFFCURVE",
-"1246 445 OFFCURVE",
-"1246 485 CURVE SMOOTH",
-"1246 561 OFFCURVE",
-"1206 612 OFFCURVE",
-"1121 612 CURVE SMOOTH",
-"1021 612 OFFCURVE",
-"968 543 OFFCURVE",
-"968 446 CURVE SMOOTH",
-"968 429 LINE",
-"1019 429 LINE SMOOTH",
-"1113 429 OFFCURVE",
-"1163 414 OFFCURVE",
-"1199 386 CURVE SMOOTH",
-"1237 356 OFFCURVE",
-"1254 311 OFFCURVE",
-"1254 253 CURVE SMOOTH",
-"1254 118 OFFCURVE",
-"1167 15 OFFCURVE",
-"950 15 CURVE SMOOTH",
-"734 15 OFFCURVE",
-"647 116 OFFCURVE",
-"647 253 CURVE SMOOTH",
-"647 311 OFFCURVE",
-"664 356 OFFCURVE",
-"702 386 CURVE SMOOTH",
-"738 414 OFFCURVE",
-"788 429 OFFCURVE",
-"882 429 CURVE SMOOTH",
-"933 429 LINE",
-"933 446 LINE SMOOTH",
-"933 544 OFFCURVE",
-"879 612 OFFCURVE",
-"782 612 CURVE SMOOTH",
-"705 612 OFFCURVE",
-"655 568 OFFCURVE",
-"655 498 CURVE SMOOTH",
-"655 486 OFFCURVE",
-"657 462 OFFCURVE",
-"661 449 CURVE",
-"687 452 LINE",
-"685 462 OFFCURVE",
-"682 478 OFFCURVE",
-"682 495 CURVE SMOOTH",
-"682 557 OFFCURVE",
-"719 586 OFFCURVE",
-"784 586 CURVE SMOOTH",
-"854 586 OFFCURVE",
-"904 540 OFFCURVE",
-"907 452 CURVE",
-"915 455 LINE",
-"878 455 LINE SMOOTH",
-"698 455 OFFCURVE",
-"625 387 OFFCURVE",
-"625 251 CURVE SMOOTH",
-"625 92 OFFCURVE",
-"726 -11 OFFCURVE",
-"950 -11 CURVE SMOOTH"
-);
+name = ssasinh;
+transform = "{1, 0, 0, 1, 680, 0}";
 }
 );
-width = 1322;
+layerId = "7977A986-4EFB-4152-84F8-5A02CD382AAF";
+width = 1423;
 },
 {
 anchors = (
 {
 name = repaya;
-position = "{995, 730}";
+position = "{795, 730}";
 },
 {
 name = top;
-position = "{791.419, 533}";
+position = "{591, 533}";
 }
 );
-layerId = UUID0;
-paths = (
-{
-closed = 1;
-nodes = (
-"656 -11 OFFCURVE",
-"700 79 OFFCURVE",
-"700 192 CURVE SMOOTH",
-"700 361 OFFCURVE",
-"604 448 OFFCURVE",
-"434 448 CURVE SMOOTH",
-"360 448 OFFCURVE",
-"308 432 OFFCURVE",
-"283 415 CURVE",
-"186 334 LINE",
-"280 372 OFFCURVE",
-"328 380 OFFCURVE",
-"420 380 CURVE SMOOTH",
-"568 380 OFFCURVE",
-"640 309 OFFCURVE",
-"640 191 CURVE SMOOTH",
-"640 119 OFFCURVE",
-"615 60 OFFCURVE",
-"537 60 CURVE SMOOTH",
-"468 60 OFFCURVE",
-"432 120 OFFCURVE",
-"432 204 CURVE SMOOTH",
-"432 214 LINE",
-"365 214 LINE",
-"365 208 LINE SMOOTH",
-"365 107 OFFCURVE",
-"331 60 OFFCURVE",
-"263 60 CURVE SMOOTH",
-"182 60 OFFCURVE",
-"163 115 OFFCURVE",
-"163 187 CURVE SMOOTH",
-"163 196 OFFCURVE",
-"163 205 OFFCURVE",
-"165 214 CURVE",
-"103 214 LINE",
-"100 200 OFFCURVE",
-"98 184 OFFCURVE",
-"98 170 CURVE SMOOTH",
-"98 22 OFFCURVE",
-"192 -11 OFFCURVE",
-"258 -11 CURVE SMOOTH",
-"323 -11 OFFCURVE",
-"365 15 OFFCURVE",
-"398 77 CURVE",
-"426 27 OFFCURVE",
-"471 -11 OFFCURVE",
-"542 -11 CURVE SMOOTH"
-);
-},
+components = (
 {
-closed = 1;
-nodes = (
-"86 592 OFFCURVE",
-"33 548 OFFCURVE",
-"33 467 CURVE SMOOTH",
-"33 444 OFFCURVE",
-"38 415 OFFCURVE",
-"46 389 CURVE",
-"116 403 LINE",
-"111 420 OFFCURVE",
-"105 437 OFFCURVE",
-"105 459 CURVE SMOOTH",
-"105 506 OFFCURVE",
-"131 526 OFFCURVE",
-"168 526 CURVE SMOOTH",
-"226 526 OFFCURVE",
-"244 465 OFFCURVE",
-"252 398 CURVE",
-"310 434 LINE",
-"303 509 OFFCURVE",
-"265 592 OFFCURVE",
-"167 592 CURVE SMOOTH"
-);
+name = _part.ka;
+transform = "{1, 0, 0, 1, 50, 0}";
 },
 {
-closed = 1;
-nodes = (
-"672 544 OFFCURVE",
-"697 542 OFFCURVE",
-"720 538 CURVE",
-"824 583 LINE",
-"769 603 OFFCURVE",
-"714 612 OFFCURVE",
-"640 612 CURVE SMOOTH",
-"496 612 OFFCURVE",
-"396 580 OFFCURVE",
-"277 479 CURVE SMOOTH",
-"256 461 LINE SMOOTH",
-"184 396 OFFCURVE",
-"121 321 OFFCURVE",
-"21 180 CURVE",
-"85 144 LINE",
-"110 188 LINE",
-"129 208 LINE",
-"185 287 OFFCURVE",
-"239 356 OFFCURVE",
-"294 410 CURVE SMOOTH",
-"305 420 LINE SMOOTH",
-"393 501 OFFCURVE",
-"492 544 OFFCURVE",
-"646 544 CURVE SMOOTH"
-);
-},
-{
-closed = 1;
-nodes = (
-"1239 -11 OFFCURVE",
-"1356 89 OFFCURVE",
-"1356 251 CURVE SMOOTH",
-"1356 382 OFFCURVE",
-"1275 455 OFFCURVE",
-"1100 455 CURVE SMOOTH",
-"1080 455 LINE",
-"1084 452 LINE",
-"1086 517 OFFCURVE",
-"1125 546 OFFCURVE",
-"1177 546 CURVE SMOOTH",
-"1225 546 OFFCURVE",
-"1253 520 OFFCURVE",
-"1253 470 CURVE SMOOTH",
-"1253 447 OFFCURVE",
-"1245 422 OFFCURVE",
-"1227 402 CURVE",
-"1218 388 LINE",
-"1167 337 OFFCURVE",
-"1101 328 OFFCURVE",
-"1025 328 CURVE SMOOTH",
-"969 328 LINE SMOOTH",
-"913 328 OFFCURVE",
-"878 323 OFFCURVE",
-"848 307 CURVE SMOOTH",
-"822 293 OFFCURVE",
-"806 270 OFFCURVE",
-"806 231 CURVE SMOOTH",
-"806 164 OFFCURVE",
-"863 123 OFFCURVE",
-"989 123 CURVE SMOOTH",
-"1139 123 OFFCURVE",
-"1179 175 OFFCURVE",
-"1179 232 CURVE SMOOTH",
-"1179 257 OFFCURVE",
-"1171 284 OFFCURVE",
-"1151 307 CURVE",
-"1085 290 LINE",
-"1104 271 OFFCURVE",
-"1111 255 OFFCURVE",
-"1111 234 CURVE SMOOTH",
-"1111 203 OFFCURVE",
-"1090 185 OFFCURVE",
-"989 185 CURVE SMOOTH",
-"914 185 OFFCURVE",
-"874 195 OFFCURVE",
-"874 227 CURVE SMOOTH",
-"874 259 OFFCURVE",
-"902 266 OFFCURVE",
-"952 266 CURVE SMOOTH",
-"1018 266 LINE SMOOTH",
-"1148 266 OFFCURVE",
-"1231 298 OFFCURVE",
-"1288 371 CURVE SMOOTH",
-"1311 400 OFFCURVE",
-"1325 436 OFFCURVE",
-"1325 479 CURVE SMOOTH",
-"1325 567 OFFCURVE",
-"1271 612 OFFCURVE",
-"1178 612 CURVE SMOOTH",
-"1074 612 OFFCURVE",
-"1013 549 OFFCURVE",
-"1013 430 CURVE SMOOTH",
-"1013 389 LINE",
-"1077 389 LINE SMOOTH",
-"1162 389 OFFCURVE",
-"1204 380 OFFCURVE",
-"1235 359 CURVE SMOOTH",
-"1267 337 OFFCURVE",
-"1283 301 OFFCURVE",
-"1283 249 CURVE SMOOTH",
-"1283 141 OFFCURVE",
-"1199 60 OFFCURVE",
-"997 60 CURVE SMOOTH",
-"793 60 OFFCURVE",
-"711 142 OFFCURVE",
-"711 249 CURVE SMOOTH",
-"711 296 OFFCURVE",
-"725 329 OFFCURVE",
-"750 351 CURVE SMOOTH",
-"781 378 OFFCURVE",
-"826 389 OFFCURVE",
-"916 389 CURVE SMOOTH",
-"981 389 LINE",
-"981 430 LINE SMOOTH",
-"981 549 OFFCURVE",
-"920 612 OFFCURVE",
-"812 612 CURVE SMOOTH",
-"722 612 OFFCURVE",
-"668 572 OFFCURVE",
-"668 496 CURVE SMOOTH",
-"668 479 OFFCURVE",
-"670 462 OFFCURVE",
-"675 446 CURVE",
-"745 458 LINE",
-"743 465 OFFCURVE",
-"741 480 OFFCURVE",
-"741 487 CURVE SMOOTH",
-"741 526 OFFCURVE",
-"767 546 OFFCURVE",
-"817 546 CURVE SMOOTH",
-"869 546 OFFCURVE",
-"908 517 OFFCURVE",
-"910 452 CURVE",
-"917 455 LINE",
-"894 455 LINE SMOOTH",
-"721 455 OFFCURVE",
-"646 380 OFFCURVE",
-"646 251 CURVE SMOOTH",
-"646 89 OFFCURVE",
-"750 -11 OFFCURVE",
-"996 -11 CURVE SMOOTH"
-);
+name = ssasinh;
+transform = "{1, 0, 0, 1, 700, 0}";
 }
 );
-width = 1392;
+layerId = UUID0;
+width = 1490;
 },
 {
 anchors = (
 {
 name = repaya;
-position = "{1063.621, 730}";
+position = "{795, 730}";
 },
 {
 name = top;
-position = "{846, 533}";
+position = "{591, 533}";
 }
 );
-layerId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
-paths = (
+components = (
 {
-closed = 1;
-nodes = (
-"744 -11 OFFCURVE",
-"788 87 OFFCURVE",
-"788 214 CURVE SMOOTH",
-"788 352 OFFCURVE",
-"705 446 OFFCURVE",
-"521 446 CURVE SMOOTH",
-"430 446 OFFCURVE",
-"346 406 OFFCURVE",
-"294 372 CURVE",
-"210 291 LINE",
-"289 313 OFFCURVE",
-"367 329 OFFCURVE",
-"482 329 CURVE SMOOTH",
-"619 329 OFFCURVE",
-"666 284 OFFCURVE",
-"666 226 CURVE SMOOTH",
-"666 175 OFFCURVE",
-"640 163 OFFCURVE",
-"605 163 CURVE SMOOTH",
-"559 163 OFFCURVE",
-"536 195 OFFCURVE",
-"536 255 CURVE SMOOTH",
-"536 263 LINE",
-"411 263 LINE",
-"411 250 LINE SMOOTH",
-"411 182 OFFCURVE",
-"382 163 OFFCURVE",
-"348 163 CURVE SMOOTH",
-"316 163 OFFCURVE",
-"287 170 OFFCURVE",
-"287 237 CURVE SMOOTH",
-"287 249 OFFCURVE",
-"287 257 OFFCURVE",
-"288 263 CURVE",
-"183 263 LINE",
-"172 234 OFFCURVE",
-"165 188 OFFCURVE",
-"165 152 CURVE SMOOTH",
-"165 106 OFFCURVE",
-"188 -11 OFFCURVE",
-"324 -11 CURVE SMOOTH",
-"399 -11 OFFCURVE",
-"434 14 OFFCURVE",
-"473 63 CURVE",
-"512 11 OFFCURVE",
-"559 -11 OFFCURVE",
-"625 -11 CURVE SMOOTH"
-);
-},
-{
-closed = 1;
-nodes = (
-"77 599 OFFCURVE",
-"17 541 OFFCURVE",
-"17 452 CURVE SMOOTH",
-"17 434 OFFCURVE",
-"20 398 OFFCURVE",
-"28 371 CURVE",
-"173 399 LINE",
-"170 412 OFFCURVE",
-"167 430 OFFCURVE",
-"167 443 CURVE SMOOTH",
-"167 459 OFFCURVE",
-"172 478 OFFCURVE",
-"196 478 CURVE SMOOTH",
-"214 478 OFFCURVE",
-"227 463 OFFCURVE",
-"238 421 CURVE",
-"379 445 LINE",
-"348 549 OFFCURVE",
-"291 599 OFFCURVE",
-"192 599 CURVE SMOOTH"
-);
-},
-{
-closed = 1;
-nodes = (
-"724 489 OFFCURVE",
-"754 488 OFFCURVE",
-"780 485 CURVE",
-"881 603 LINE",
-"831 615 OFFCURVE",
-"774 622 OFFCURVE",
-"688 622 CURVE SMOOTH",
-"523 622 OFFCURVE",
-"414 585 OFFCURVE",
-"300 491 CURVE",
-"270 463 LINE",
-"198 398 OFFCURVE",
-"100 288 OFFCURVE",
-"14 185 CURVE",
-"140 107 LINE",
-"172 156 LINE",
-"187 180 LINE",
-"234 244 OFFCURVE",
-"307 318 OFFCURVE",
-"360 372 CURVE",
-"394 413 LINE",
-"456 452 OFFCURVE",
-"532 489 OFFCURVE",
-"685 489 CURVE SMOOTH"
-);
+name = _part.ka;
+transform = "{1, 0, 0, 1, 30, 0}";
 },
 {
-closed = 1;
-nodes = (
-"1350 -11 OFFCURVE",
-"1460 92 OFFCURVE",
-"1460 244 CURVE SMOOTH",
-"1460 383 OFFCURVE",
-"1372 455 OFFCURVE",
-"1200 455 CURVE SMOOTH",
-"1193 455 LINE",
-"1220 452 LINE",
-"1223 478 OFFCURVE",
-"1232 501 OFFCURVE",
-"1262 501 CURVE SMOOTH",
-"1284 501 OFFCURVE",
-"1294 489 OFFCURVE",
-"1294 468 CURVE SMOOTH",
-"1294 444 OFFCURVE",
-"1281 421 OFFCURVE",
-"1259 405 CURVE",
-"1264 388 LINE",
-"1248 340 OFFCURVE",
-"1228 336 OFFCURVE",
-"1181 336 CURVE SMOOTH",
-"1001 336 LINE SMOOTH",
-"938 336 OFFCURVE",
-"903 328 OFFCURVE",
-"879 311 CURVE SMOOTH",
-"858 296 OFFCURVE",
-"847 275 OFFCURVE",
-"847 244 CURVE SMOOTH",
-"847 182 OFFCURVE",
-"908 137 OFFCURVE",
-"1056 137 CURVE SMOOTH",
-"1226 137 OFFCURVE",
-"1269 188 OFFCURVE",
-"1269 244 CURVE SMOOTH",
-"1269 270 OFFCURVE",
-"1259 294 OFFCURVE",
-"1233 316 CURVE",
-"1104 282 LINE",
-"1124 271 OFFCURVE",
-"1133 258 OFFCURVE",
-"1133 244 CURVE SMOOTH",
-"1133 230 OFFCURVE",
-"1120 223 OFFCURVE",
-"1057 223 CURVE SMOOTH",
-"986 223 OFFCURVE",
-"980 230 OFFCURVE",
-"980 240 CURVE SMOOTH",
-"980 249 OFFCURVE",
-"989 250 OFFCURVE",
-"1001 250 CURVE SMOOTH",
-"1149 250 LINE SMOOTH",
-"1233 250 OFFCURVE",
-"1326 272 OFFCURVE",
-"1386 346 CURVE SMOOTH",
-"1414 380 OFFCURVE",
-"1439 419 OFFCURVE",
-"1439 480 CURVE SMOOTH",
-"1439 577 OFFCURVE",
-"1380 622 OFFCURVE",
-"1277 622 CURVE SMOOTH",
-"1130 622 OFFCURVE",
-"1075 518 OFFCURVE",
-"1075 377 CURVE SMOOTH",
-"1075 359 LINE",
-"1159 359 LINE SMOOTH",
-"1226 359 OFFCURVE",
-"1258 352 OFFCURVE",
-"1286 331 CURVE SMOOTH",
-"1307 316 OFFCURVE",
-"1320 291 OFFCURVE",
-"1320 255 CURVE SMOOTH",
-"1320 181 OFFCURVE",
-"1263 113 OFFCURVE",
-"1063 113 CURVE SMOOTH",
-"859 113 OFFCURVE",
-"802 181 OFFCURVE",
-"802 256 CURVE SMOOTH",
-"802 291 OFFCURVE",
-"815 315 OFFCURVE",
-"836 330 CURVE SMOOTH",
-"864 351 OFFCURVE",
-"898 357 OFFCURVE",
-"975 357 CURVE SMOOTH",
-"1047 357 LINE",
-"1047 377 LINE SMOOTH",
-"1047 514 OFFCURVE",
-"994 622 OFFCURVE",
-"845 622 CURVE SMOOTH",
-"748 622 OFFCURVE",
-"683 582 OFFCURVE",
-"683 492 CURVE SMOOTH",
-"683 480 OFFCURVE",
-"684 460 OFFCURVE",
-"687 443 CURVE",
-"829 458 LINE",
-"829 459 OFFCURVE",
-"829 462 OFFCURVE",
-"829 466 CURVE SMOOTH",
-"829 483 OFFCURVE",
-"838 501 OFFCURVE",
-"861 501 CURVE SMOOTH",
-"890 501 OFFCURVE",
-"899 478 OFFCURVE",
-"902 452 CURVE",
-"929 455 LINE",
-"922 455 LINE SMOOTH",
-"750 455 OFFCURVE",
-"681 383 OFFCURVE",
-"681 244 CURVE SMOOTH",
-"681 92 OFFCURVE",
-"772 -11 OFFCURVE",
-"1061 -11 CURVE SMOOTH"
-);
+name = ssasinh;
+transform = "{1, 0, 0, 1, 620, 0}";
 }
 );
+layerId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
 width = 1488;
 },
 {
@@ -1435,7 +790,249 @@ nodes = (
 }
 );
 width = 1152;
+},
+{
+anchors = (
+{
+name = repaya;
+position = "{1063.621, 730}";
+},
+{
+name = top;
+position = "{846, 533}";
+}
+);
+associatedMasterId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
+layerId = "0058F495-CD6A-4E9F-AA72-0AE092F903C3";
+name = "29 Dec 24 at 17:10";
+paths = (
+{
+closed = 1;
+nodes = (
+"744 -11 OFFCURVE",
+"788 87 OFFCURVE",
+"788 214 CURVE SMOOTH",
+"788 352 OFFCURVE",
+"705 446 OFFCURVE",
+"521 446 CURVE SMOOTH",
+"430 446 OFFCURVE",
+"346 406 OFFCURVE",
+"294 372 CURVE",
+"210 291 LINE",
+"289 313 OFFCURVE",
+"367 329 OFFCURVE",
+"482 329 CURVE SMOOTH",
+"619 329 OFFCURVE",
+"666 284 OFFCURVE",
+"666 226 CURVE SMOOTH",
+"666 175 OFFCURVE",
+"640 163 OFFCURVE",
+"605 163 CURVE SMOOTH",
+"559 163 OFFCURVE",
+"536 195 OFFCURVE",
+"536 255 CURVE SMOOTH",
+"536 263 LINE",
+"411 263 LINE",
+"411 250 LINE SMOOTH",
+"411 182 OFFCURVE",
+"382 163 OFFCURVE",
+"348 163 CURVE SMOOTH",
+"316 163 OFFCURVE",
+"287 170 OFFCURVE",
+"287 237 CURVE SMOOTH",
+"287 249 OFFCURVE",
+"287 257 OFFCURVE",
+"288 263 CURVE",
+"183 263 LINE",
+"172 234 OFFCURVE",
+"165 188 OFFCURVE",
+"165 152 CURVE SMOOTH",
+"165 106 OFFCURVE",
+"188 -11 OFFCURVE",
+"324 -11 CURVE SMOOTH",
+"399 -11 OFFCURVE",
+"434 14 OFFCURVE",
+"473 63 CURVE",
+"512 11 OFFCURVE",
+"559 -11 OFFCURVE",
+"625 -11 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"77 599 OFFCURVE",
+"17 541 OFFCURVE",
+"17 452 CURVE SMOOTH",
+"17 434 OFFCURVE",
+"20 398 OFFCURVE",
+"28 371 CURVE",
+"173 399 LINE",
+"170 412 OFFCURVE",
+"167 430 OFFCURVE",
+"167 443 CURVE SMOOTH",
+"167 459 OFFCURVE",
+"172 478 OFFCURVE",
+"196 478 CURVE SMOOTH",
+"214 478 OFFCURVE",
+"227 463 OFFCURVE",
+"238 421 CURVE",
+"379 445 LINE",
+"348 549 OFFCURVE",
+"291 599 OFFCURVE",
+"192 599 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"724 489 OFFCURVE",
+"754 488 OFFCURVE",
+"780 485 CURVE",
+"881 603 LINE",
+"831 615 OFFCURVE",
+"774 622 OFFCURVE",
+"688 622 CURVE SMOOTH",
+"523 622 OFFCURVE",
+"414 585 OFFCURVE",
+"300 491 CURVE",
+"270 463 LINE",
+"198 398 OFFCURVE",
+"100 288 OFFCURVE",
+"14 185 CURVE",
+"140 107 LINE",
+"172 156 LINE",
+"187 180 LINE",
+"234 244 OFFCURVE",
+"307 318 OFFCURVE",
+"360 372 CURVE",
+"394 413 LINE",
+"456 452 OFFCURVE",
+"532 489 OFFCURVE",
+"685 489 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"1350 -11 OFFCURVE",
+"1460 92 OFFCURVE",
+"1460 244 CURVE SMOOTH",
+"1460 383 OFFCURVE",
+"1372 455 OFFCURVE",
+"1200 455 CURVE SMOOTH",
+"1193 455 LINE",
+"1220 452 LINE",
+"1223 478 OFFCURVE",
+"1232 501 OFFCURVE",
+"1262 501 CURVE SMOOTH",
+"1284 501 OFFCURVE",
+"1294 489 OFFCURVE",
+"1294 468 CURVE SMOOTH",
+"1294 444 OFFCURVE",
+"1281 421 OFFCURVE",
+"1259 405 CURVE",
+"1264 388 LINE",
+"1248 340 OFFCURVE",
+"1228 336 OFFCURVE",
+"1181 336 CURVE SMOOTH",
+"1001 336 LINE SMOOTH",
+"938 336 OFFCURVE",
+"903 328 OFFCURVE",
+"879 311 CURVE SMOOTH",
+"858 296 OFFCURVE",
+"847 275 OFFCURVE",
+"847 244 CURVE SMOOTH",
+"847 182 OFFCURVE",
+"908 137 OFFCURVE",
+"1056 137 CURVE SMOOTH",
+"1226 137 OFFCURVE",
+"1269 188 OFFCURVE",
+"1269 244 CURVE SMOOTH",
+"1269 270 OFFCURVE",
+"1259 294 OFFCURVE",
+"1233 316 CURVE",
+"1104 282 LINE",
+"1124 271 OFFCURVE",
+"1133 258 OFFCURVE",
+"1133 244 CURVE SMOOTH",
+"1133 230 OFFCURVE",
+"1120 223 OFFCURVE",
+"1057 223 CURVE SMOOTH",
+"986 223 OFFCURVE",
+"980 230 OFFCURVE",
+"980 240 CURVE SMOOTH",
+"980 249 OFFCURVE",
+"989 250 OFFCURVE",
+"1001 250 CURVE SMOOTH",
+"1149 250 LINE SMOOTH",
+"1233 250 OFFCURVE",
+"1326 272 OFFCURVE",
+"1386 346 CURVE SMOOTH",
+"1414 380 OFFCURVE",
+"1439 419 OFFCURVE",
+"1439 480 CURVE SMOOTH",
+"1439 577 OFFCURVE",
+"1380 622 OFFCURVE",
+"1277 622 CURVE SMOOTH",
+"1130 622 OFFCURVE",
+"1075 518 OFFCURVE",
+"1075 377 CURVE SMOOTH",
+"1075 359 LINE",
+"1159 359 LINE SMOOTH",
+"1226 359 OFFCURVE",
+"1258 352 OFFCURVE",
+"1286 331 CURVE SMOOTH",
+"1307 316 OFFCURVE",
+"1320 291 OFFCURVE",
+"1320 255 CURVE SMOOTH",
+"1320 181 OFFCURVE",
+"1263 113 OFFCURVE",
+"1063 113 CURVE SMOOTH",
+"859 113 OFFCURVE",
+"802 181 OFFCURVE",
+"802 256 CURVE SMOOTH",
+"802 291 OFFCURVE",
+"815 315 OFFCURVE",
+"836 330 CURVE SMOOTH",
+"864 351 OFFCURVE",
+"898 357 OFFCURVE",
+"975 357 CURVE SMOOTH",
+"1047 357 LINE",
+"1047 377 LINE SMOOTH",
+"1047 514 OFFCURVE",
+"994 622 OFFCURVE",
+"845 622 CURVE SMOOTH",
+"748 622 OFFCURVE",
+"683 582 OFFCURVE",
+"683 492 CURVE SMOOTH",
+"683 480 OFFCURVE",
+"684 460 OFFCURVE",
+"687 443 CURVE",
+"829 458 LINE",
+"829 459 OFFCURVE",
+"829 462 OFFCURVE",
+"829 466 CURVE SMOOTH",
+"829 483 OFFCURVE",
+"838 501 OFFCURVE",
+"861 501 CURVE SMOOTH",
+"890 501 OFFCURVE",
+"899 478 OFFCURVE",
+"902 452 CURVE",
+"929 455 LINE",
+"922 455 LINE SMOOTH",
+"750 455 OFFCURVE",
+"681 383 OFFCURVE",
+"681 244 CURVE SMOOTH",
+"681 92 OFFCURVE",
+"772 -11 OFFCURVE",
+"1061 -11 CURVE SMOOTH"
+);
+}
+);
+width = 1488;
 }
 );
 rightKerningGroup = pasinh;
+rightMetricsKey = ssasinh;
 }
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/kavasinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/kavasinh.glyph
index b301bf63..a43914eb 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/kavasinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/kavasinh.glyph
@@ -1093,6 +1093,50 @@ nodes = (
 }
 );
 width = 1147;
+},
+{
+anchors = (
+{
+name = repaya;
+position = "{965, 800}";
+}
+);
+associatedMasterId = UUID0;
+components = (
+{
+name = _part.ka;
+transform = "{1, 0, 0, 1, 30, 0}";
+},
+{
+name = vasinh;
+transform = "{1, 0, 0, 1, 610, 0}";
+}
+);
+layerId = "FF57CD2F-BE68-4A4B-A882-F51D8A2423FB";
+name = "29 Dec 24 at 17:19";
+width = 1392;
+},
+{
+anchors = (
+{
+name = repaya;
+position = "{965, 800}";
+}
+);
+associatedMasterId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
+components = (
+{
+name = _part.ka;
+transform = "{1, 0, 0, 1, 30, 0}";
+},
+{
+name = vasinh;
+transform = "{1, 0, 0, 1, 660, 0}";
+}
+);
+layerId = "67F77EEB-9249-4258-BF7D-27AF7CF40BA5";
+name = "29 Dec 24 at 17:20";
+width = 1488;
 }
 );
 rightKerningGroup = casinh;
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/kaviivowelsinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/kaviivowelsinh.glyph
index 1a6cf4b4..3d9cc4ee 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/kaviivowelsinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/kaviivowelsinh.glyph
@@ -1357,6 +1357,134 @@ nodes = (
 }
 );
 width = 1147;
+},
+{
+associatedMasterId = UUID0;
+components = (
+{
+name = _part.ka;
+transform = "{1, 0, 0, 1, 40, 0}";
+}
+);
+layerId = "9AF2AFD4-4270-41A3-B4C2-A551261C0087";
+name = "29 Dec 24 at 17:18";
+paths = (
+{
+closed = 1;
+nodes = (
+"1251 -11 OFFCURVE",
+"1356 170 OFFCURVE",
+"1356 375 CURVE SMOOTH",
+"1356 491 OFFCURVE",
+"1323 581 OFFCURVE",
+"1267 637 CURVE SMOOTH",
+"1238 666 OFFCURVE",
+"1206 686 OFFCURVE",
+"1166 703 CURVE",
+"1100 733 OFFCURVE",
+"1031 747 OFFCURVE",
+"929 747 CURVE SMOOTH",
+"865 747 LINE SMOOTH",
+"812 747 OFFCURVE",
+"785 751 OFFCURVE",
+"771 764 CURVE SMOOTH",
+"762 771 OFFCURVE",
+"757 783 OFFCURVE",
+"757 799 CURVE SMOOTH",
+"757 858 OFFCURVE",
+"829 887 OFFCURVE",
+"982 887 CURVE SMOOTH",
+"1038 887 OFFCURVE",
+"1089 881 OFFCURVE",
+"1127 874 CURVE",
+"1213 855 OFFCURVE",
+"1249 817 OFFCURVE",
+"1249 771 CURVE SMOOTH",
+"1249 738 OFFCURVE",
+"1231 720 OFFCURVE",
+"1197 720 CURVE SMOOTH",
+"1161 720 OFFCURVE",
+"1138 741 OFFCURVE",
+"1138 776 CURVE SMOOTH",
+"1138 815 OFFCURVE",
+"1162 845 OFFCURVE",
+"1200 867 CURVE",
+"1143 896 LINE",
+"1110 871 OFFCURVE",
+"1072 829 OFFCURVE",
+"1072 774 CURVE SMOOTH",
+"1072 702 OFFCURVE",
+"1135 667 OFFCURVE",
+"1198 667 CURVE SMOOTH",
+"1279 667 OFFCURVE",
+"1319 708 OFFCURVE",
+"1319 775 CURVE SMOOTH",
+"1319 873 OFFCURVE",
+"1227 957 OFFCURVE",
+"981 957 CURVE SMOOTH",
+"769 957 OFFCURVE",
+"685 891 OFFCURVE",
+"685 799 CURVE SMOOTH",
+"685 759 OFFCURVE",
+"698 732 OFFCURVE",
+"720 713 CURVE SMOOTH",
+"748 688 OFFCURVE",
+"785 677 OFFCURVE",
+"873 677 CURVE SMOOTH",
+"924 677 LINE SMOOTH",
+"1073 677 OFFCURVE",
+"1157 654 OFFCURVE",
+"1220 580 CURVE SMOOTH",
+"1260 533 OFFCURVE",
+"1281 465 OFFCURVE",
+"1281 374 CURVE SMOOTH",
+"1281 228 OFFCURVE",
+"1214 60 OFFCURVE",
+"952 60 CURVE SMOOTH",
+"801 60 OFFCURVE",
+"712 131 OFFCURVE",
+"712 250 CURVE SMOOTH",
+"712 289 OFFCURVE",
+"725 327 OFFCURVE",
+"760 352 CURVE SMOOTH",
+"792 375 OFFCURVE",
+"836 389 OFFCURVE",
+"933 389 CURVE SMOOTH",
+"1054 389 LINE",
+"1054 430 LINE SMOOTH",
+"1054 549 OFFCURVE",
+"993 612 OFFCURVE",
+"885 612 CURVE SMOOTH",
+"795 612 OFFCURVE",
+"741 572 OFFCURVE",
+"741 496 CURVE SMOOTH",
+"741 479 OFFCURVE",
+"743 465 OFFCURVE",
+"746 455 CURVE",
+"816 466 LINE",
+"815 473 OFFCURVE",
+"814 480 OFFCURVE",
+"814 487 CURVE SMOOTH",
+"814 526 OFFCURVE",
+"840 546 OFFCURVE",
+"890 546 CURVE SMOOTH",
+"942 546 OFFCURVE",
+"980 517 OFFCURVE",
+"983 455 CURVE",
+"912 455 LINE SMOOTH",
+"816 455 OFFCURVE",
+"749 431 OFFCURVE",
+"706 392 CURVE SMOOTH",
+"666 356 OFFCURVE",
+"647 306 OFFCURVE",
+"647 250 CURVE SMOOTH",
+"647 83 OFFCURVE",
+"748 -11 OFFCURVE",
+"951 -11 CURVE SMOOTH"
+);
+}
+);
+width = 1392;
 }
 );
 rightKerningGroup = casinh;
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/ndasinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/ndasinh.glyph
index 58307d8c..d87707a4 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/ndasinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/ndasinh.glyph
@@ -120,36 +120,13 @@ components = (
 {
 name = dasinh;
 transform = "{1, 0, 0, 1, 153, 0}";
-}
-);
-layerId = "7977A986-4EFB-4152-84F8-5A02CD382AAF";
-paths = (
+},
 {
-closed = 1;
-nodes = (
-"41 178 OFFCURVE",
-"78 79 OFFCURVE",
-"143 0 CURVE",
-"168 13 LINE",
-"104 86 OFFCURVE",
-"68 180 OFFCURVE",
-"68 275 CURVE SMOOTH",
-"68 473 OFFCURVE",
-"204 598 OFFCURVE",
-"421 598 CURVE SMOOTH",
-"433 598 OFFCURVE",
-"463 596 OFFCURVE",
-"476 594 CURVE",
-"530 606 LINE",
-"488 616 OFFCURVE",
-"456 620 OFFCURVE",
-"420 620 CURVE SMOOTH",
-"187 620 OFFCURVE",
-"41 487 OFFCURVE",
-"41 276 CURVE SMOOTH"
-);
+name = "sanyaka-sinh";
+transform = "{1, 0, 0, 1, 10, 0}";
 }
 );
+layerId = "7977A986-4EFB-4152-84F8-5A02CD382AAF";
 width = 693;
 },
 {
@@ -270,80 +247,34 @@ components = (
 {
 name = dasinh;
 transform = "{1, 0, 0, 1, 155, 0}";
-}
-);
-layerId = UUID0;
-paths = (
+},
 {
-closed = 1;
-nodes = (
-"36 158 OFFCURVE",
-"72 71 OFFCURVE",
-"119 0 CURVE",
-"185 34 LINE",
-"140 99 OFFCURVE",
-"109 180 OFFCURVE",
-"109 268 CURVE SMOOTH",
-"109 431 OFFCURVE",
-"193 553 OFFCURVE",
-"438 553 CURVE SMOOTH",
-"448 553 OFFCURVE",
-"474 552 OFFCURVE",
-"483 551 CURVE",
-"546 608 LINE",
-"511 615 OFFCURVE",
-"462 616 OFFCURVE",
-"433 616 CURVE SMOOTH",
-"168 616 OFFCURVE",
-"36 487 OFFCURVE",
-"36 263 CURVE SMOOTH"
-);
+name = "sanyaka-sinh";
+transform = "{1, 0, 0, 1, 10, 0}";
 }
 );
+layerId = UUID0;
 width = 732;
 },
 {
 anchors = (
 {
 name = virama;
-position = "{694, 536}";
+position = "{728, 536}";
 }
 );
 components = (
 {
 name = dasinh;
-transform = "{1, 0, 0, 1, 193, 0}";
-}
-);
-layerId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
-paths = (
+transform = "{1, 0, 0, 1, 227, 0}";
+},
 {
-closed = 1;
-nodes = (
-"20 164 OFFCURVE",
-"50 70 OFFCURVE",
-"103 0 CURVE",
-"239 38 LINE",
-"186 116 OFFCURVE",
-"160 188 OFFCURVE",
-"160 261 CURVE SMOOTH",
-"160 342 OFFCURVE",
-"201 518 OFFCURVE",
-"392 518 CURVE SMOOTH",
-"445 518 OFFCURVE",
-"477 514 OFFCURVE",
-"494 511 CURVE",
-"667 608 LINE",
-"620 630 OFFCURVE",
-"534 646 OFFCURVE",
-"458 646 CURVE SMOOTH",
-"152 646 OFFCURVE",
-"20 493 OFFCURVE",
-"20 262 CURVE SMOOTH"
-);
+name = "sanyaka-sinh";
+transform = "{1, 0, 0, 1, 10, 0}";
 }
 );
-width = 828;
+layerId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
+width = 862;
 },
 {
 associatedMasterId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
@@ -1224,6 +1155,163 @@ nodes = (
 }
 );
 width = 850;
+},
+{
+anchors = (
+{
+name = virama;
+position = "{694, 536}";
+}
+);
+associatedMasterId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
+components = (
+{
+name = dasinh;
+transform = "{1, 0, 0, 1, 193, 0}";
+}
+);
+layerId = "52BC6582-6DA1-4E19-8A79-7A8520ACBDA9";
+name = "29 Dec 24 at 16:37";
+paths = (
+{
+closed = 1;
+nodes = (
+"20 164 OFFCURVE",
+"50 70 OFFCURVE",
+"103 0 CURVE",
+"239 38 LINE",
+"186 116 OFFCURVE",
+"160 188 OFFCURVE",
+"160 261 CURVE SMOOTH",
+"160 342 OFFCURVE",
+"201 518 OFFCURVE",
+"392 518 CURVE SMOOTH",
+"445 518 OFFCURVE",
+"477 514 OFFCURVE",
+"494 511 CURVE",
+"667 608 LINE",
+"620 630 OFFCURVE",
+"534 646 OFFCURVE",
+"458 646 CURVE SMOOTH",
+"152 646 OFFCURVE",
+"20 493 OFFCURVE",
+"20 262 CURVE SMOOTH"
+);
+}
+);
+width = 828;
+},
+{
+anchors = (
+{
+name = virama;
+position = "{694, 536}";
+}
+);
+associatedMasterId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
+components = (
+{
+name = dasinh;
+transform = "{1, 0, 0, 1, 193, 0}";
+}
+);
+layerId = "C30920C4-D973-4F4C-A885-FA779C27D3FE";
+name = "29 Dec 24 at 16:37";
+paths = (
+{
+closed = 1;
+nodes = (
+"10 164 OFFCURVE",
+"40 70 OFFCURVE",
+"93 0 CURVE",
+"229 38 LINE",
+"176 116 OFFCURVE",
+"150 188 OFFCURVE",
+"150 261 CURVE SMOOTH",
+"150 342 OFFCURVE",
+"191 518 OFFCURVE",
+"392 518 CURVE SMOOTH",
+"445 518 OFFCURVE",
+"477 514 OFFCURVE",
+"494 511 CURVE",
+"667 608 LINE",
+"620 630 OFFCURVE",
+"534 646 OFFCURVE",
+"458 646 CURVE SMOOTH",
+"142 646 OFFCURVE",
+"10 493 OFFCURVE",
+"10 262 CURVE SMOOTH"
+);
+}
+);
+width = 828;
+},
+{
+anchors = (
+{
+name = virama;
+position = "{694, 536}";
+}
+);
+associatedMasterId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
+components = (
+{
+name = dasinh;
+transform = "{1, 0, 0, 1, 193, 0}";
+}
+);
+layerId = "B7394843-49E7-45D0-B40A-6EC7D94C9364";
+name = "29 Dec 24 at 16:39";
+paths = (
+{
+closed = 1;
+nodes = (
+"10 164 OFFCURVE",
+"40 70 OFFCURVE",
+"93 0 CURVE",
+"229 38 LINE",
+"176 116 OFFCURVE",
+"150 188 OFFCURVE",
+"150 261 CURVE SMOOTH",
+"150 342 OFFCURVE",
+"191 518 OFFCURVE",
+"392 518 CURVE SMOOTH",
+"445 518 OFFCURVE",
+"477 514 OFFCURVE",
+"494 511 CURVE",
+"667 608 LINE",
+"620 630 OFFCURVE",
+"534 646 OFFCURVE",
+"458 646 CURVE SMOOTH",
+"142 646 OFFCURVE",
+"10 493 OFFCURVE",
+"10 262 CURVE SMOOTH"
+);
+}
+);
+width = 828;
+},
+{
+anchors = (
+{
+name = virama;
+position = "{694, 536}";
+}
+);
+associatedMasterId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
+components = (
+{
+name = dasinh;
+transform = "{1, 0, 0, 1, 193, 0}";
+},
+{
+name = "sanyaka-sinh";
+transform = "{1, 0, 0, 1, -24, 0}";
+}
+);
+layerId = "9ADCDB5D-E02B-415C-B962-3C5CB425CA2E";
+name = "29 Dec 24 at 16:39";
+width = 828;
 }
 );
 leftMetricsKey = gasinh;
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/nduvowelsinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/nduvowelsinh.glyph
index d11303c6..d14e4b95 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/nduvowelsinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/nduvowelsinh.glyph
@@ -3,314 +3,45 @@ color = 3;
 glyphname = nduvowelsinh;
 layers = (
 {
-layerId = "7977A986-4EFB-4152-84F8-5A02CD382AAF";
-paths = (
+components = (
 {
-closed = 1;
-nodes = (
-"119 -183 OFFCURVE",
-"128 -203 OFFCURVE",
-"142 -218 CURVE SMOOTH",
-"171 -248 OFFCURVE",
-"214 -257 OFFCURVE",
-"292 -257 CURVE SMOOTH",
-"576 -257 LINE",
-"576 36 LINE",
-"562 49 LINE",
-"518 28 OFFCURVE",
-"481 15 OFFCURVE",
-"408 15 CURVE SMOOTH",
-"254 15 OFFCURVE",
-"169 90 OFFCURVE",
-"169 232 CURVE SMOOTH",
-"169 307 OFFCURVE",
-"195 357 OFFCURVE",
-"240 387 CURVE SMOOTH",
-"285 418 OFFCURVE",
-"346 429 OFFCURVE",
-"462 429 CURVE SMOOTH",
-"576 429 LINE",
-"576 445 LINE SMOOTH",
-"576 545 OFFCURVE",
-"523 612 OFFCURVE",
-"421 612 CURVE SMOOTH",
-"337 612 OFFCURVE",
-"291 562 OFFCURVE",
-"291 500 CURVE SMOOTH",
-"291 492 OFFCURVE",
-"291 481 OFFCURVE",
-"293 470 CURVE",
-"320 473 LINE",
-"319 480 OFFCURVE",
-"318 489 OFFCURVE",
-"318 498 CURVE SMOOTH",
-"318 556 OFFCURVE",
-"355 586 OFFCURVE",
-"421 586 CURVE SMOOTH",
-"497 586 OFFCURVE",
-"547 540 OFFCURVE",
-"550 455 CURVE",
-"445 455 LINE SMOOTH",
-"330 455 OFFCURVE",
-"269 441 OFFCURVE",
-"218 404 CURVE SMOOTH",
-"170 370 OFFCURVE",
-"142 312 OFFCURVE",
-"142 232 CURVE SMOOTH",
-"142 79 OFFCURVE",
-"235 -11 OFFCURVE",
-"406 -11 CURVE SMOOTH",
-"467 -11 OFFCURVE",
-"504 -3 OFFCURVE",
-"550 15 CURVE",
-"550 -231 LINE",
-"311 -231 LINE SMOOTH",
-"225 -231 OFFCURVE",
-"185 -225 OFFCURVE",
-"161 -199 CURVE SMOOTH",
-"152 -189 OFFCURVE",
-"146 -175 OFFCURVE",
-"146 -156 CURVE SMOOTH",
-"146 -125 OFFCURVE",
-"159 -103 OFFCURVE",
-"195 -71 CURVE",
-"176 -53 LINE",
-"140 -86 OFFCURVE",
-"119 -115 OFFCURVE",
-"119 -155 CURVE SMOOTH"
-);
+name = duvowelsinh;
+transform = "{1, 0, 0, 1, 211, 0}";
 },
 {
-closed = 1;
-nodes = (
-"41 231 OFFCURVE",
-"71 153 OFFCURVE",
-"109 83 CURVE",
-"133 96 LINE",
-"93 165 OFFCURVE",
-"68 239 OFFCURVE",
-"68 327 CURVE SMOOTH",
-"68 493 OFFCURVE",
-"171 587 OFFCURVE",
-"336 587 CURVE SMOOTH",
-"348 587 OFFCURVE",
-"363 585 OFFCURVE",
-"376 583 CURVE",
-"414 601 LINE",
-"381 609 OFFCURVE",
-"356 612 OFFCURVE",
-"330 612 CURVE SMOOTH",
-"164 612 OFFCURVE",
-"41 512 OFFCURVE",
-"41 328 CURVE SMOOTH"
-);
+name = "sanyaka-sinh";
+transform = "{1, 0, 0, 1, 41, 0}";
 }
 );
-width = 617;
+layerId = "7977A986-4EFB-4152-84F8-5A02CD382AAF";
+width = 781;
 },
 {
-layerId = UUID0;
-paths = (
+components = (
 {
-closed = 1;
-nodes = (
-"133 -175 OFFCURVE",
-"146 -203 OFFCURVE",
-"169 -223 CURVE SMOOTH",
-"196 -246 OFFCURVE",
-"241 -261 OFFCURVE",
-"329 -261 CURVE SMOOTH",
-"655 -261 LINE",
-"655 67 LINE",
-"625 90 LINE",
-"572 70 OFFCURVE",
-"524 60 OFFCURVE",
-"469 60 CURVE SMOOTH",
-"300 60 OFFCURVE",
-"241 142 OFFCURVE",
-"241 229 CURVE SMOOTH",
-"241 286 OFFCURVE",
-"261 328 OFFCURVE",
-"296 352 CURVE SMOOTH",
-"334 377 OFFCURVE",
-"374 389 OFFCURVE",
-"500 389 CURVE SMOOTH",
-"654 389 LINE",
-"654 430 LINE SMOOTH",
-"654 549 OFFCURVE",
-"592 612 OFFCURVE",
-"482 612 CURVE SMOOTH",
-"404 612 OFFCURVE",
-"335 573 OFFCURVE",
-"335 499 CURVE SMOOTH",
-"335 489 OFFCURVE",
-"336 477 OFFCURVE",
-"337 468 CURVE",
-"409 477 LINE",
-"409 481 OFFCURVE",
-"408 487 OFFCURVE",
-"408 492 CURVE SMOOTH",
-"408 525 OFFCURVE",
-"435 546 OFFCURVE",
-"487 546 CURVE SMOOTH",
-"540 546 OFFCURVE",
-"579 517 OFFCURVE",
-"583 455 CURVE",
-"487 455 LINE SMOOTH",
-"372 455 OFFCURVE",
-"316 444 OFFCURVE",
-"264 415 CURVE SMOOTH",
-"204 380 OFFCURVE",
-"166 321 OFFCURVE",
-"166 233 CURVE SMOOTH",
-"166 72 OFFCURVE",
-"283 -11 OFFCURVE",
-"460 -11 CURVE SMOOTH",
-"499 -11 OFFCURVE",
-"541 -7 OFFCURVE",
-"583 3 CURVE",
-"583 -193 LINE",
-"358 -193 LINE SMOOTH",
-"273 -193 OFFCURVE",
-"248 -189 OFFCURVE",
-"229 -177 CURVE SMOOTH",
-"214 -168 OFFCURVE",
-"206 -154 OFFCURVE",
-"206 -137 CURVE SMOOTH",
-"206 -117 OFFCURVE",
-"218 -97 OFFCURVE",
-"245 -78 CURVE",
-"195 -27 LINE",
-"156 -61 OFFCURVE",
-"133 -95 OFFCURVE",
-"133 -140 CURVE SMOOTH"
-);
+name = duvowelsinh;
+transform = "{1, 0, 0, 1, 206, 0}";
 },
 {
-closed = 1;
-nodes = (
-"36 228 OFFCURVE",
-"59 145 OFFCURVE",
-"94 83 CURVE",
-"161 116 LINE",
-"127 173 OFFCURVE",
-"109 240 OFFCURVE",
-"109 312 CURVE SMOOTH",
-"109 460 OFFCURVE",
-"193 549 OFFCURVE",
-"348 549 CURVE SMOOTH",
-"358 549 OFFCURVE",
-"374 548 OFFCURVE",
-"383 547 CURVE",
-"446 604 LINE",
-"411 611 OFFCURVE",
-"372 612 OFFCURVE",
-"343 612 CURVE SMOOTH",
-"168 612 OFFCURVE",
-"36 513 OFFCURVE",
-"36 315 CURVE SMOOTH"
-);
+name = "sanyaka-sinh";
+transform = "{1, 0, 0, 1, 36, 0}";
 }
 );
-width = 691;
+layerId = UUID0;
+width = 798;
 },
 {
-layerId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
-paths = (
+components = (
 {
-closed = 1;
-nodes = (
-"250 -244 OFFCURVE",
-"336 -291 OFFCURVE",
-"428 -291 CURVE SMOOTH",
-"844 -291 LINE",
-"844 147 LINE",
-"714 147 LINE",
-"714 -157 LINE",
-"479 -157 LINE SMOOTH",
-"409 -157 OFFCURVE",
-"367 -140 OFFCURVE",
-"399 -52 CURVE",
-"268 -51 LINE",
-"251 -96 OFFCURVE",
-"250 -129 OFFCURVE",
-"250 -150 CURVE SMOOTH"
-);
+name = duvowelsinh;
+transform = "{1, 0, 0, 1, 206, 0}";
 },
 {
-closed = 1;
-nodes = (
-"20 150 OFFCURVE",
-"69 -5 OFFCURVE",
-"223 -5 CURVE",
-"223 38 OFFCURVE",
-"224 91 OFFCURVE",
-"224 133 CURVE",
-"181 133 OFFCURVE",
-"160 188 OFFCURVE",
-"160 299 CURVE SMOOTH",
-"160 402 OFFCURVE",
-"198 510 OFFCURVE",
-"325 510 CURVE SMOOTH",
-"358 510 OFFCURVE",
-"410 498 OFFCURVE",
-"417 467 CURVE",
-"503 536 LINE",
-"482 574 OFFCURVE",
-"417 622 OFFCURVE",
-"290 622 CURVE SMOOTH",
-"110 622 OFFCURVE",
-"20 503 OFFCURVE",
-"20 300 CURVE SMOOTH"
-);
-},
-{
-closed = 1;
-nodes = (
-"826 439 LINE SMOOTH",
-"826 514 OFFCURVE",
-"773 622 OFFCURVE",
-"620 622 CURVE SMOOTH",
-"515 622 OFFCURVE",
-"463 586 OFFCURVE",
-"438 498 CURVE",
-"430 487 OFFCURVE",
-"425 481 OFFCURVE",
-"417 467 CURVE",
-"548 467 LINE",
-"555 486 OFFCURVE",
-"572 506 OFFCURVE",
-"617 506 CURVE SMOOTH",
-"667 506 OFFCURVE",
-"693 479 OFFCURVE",
-"690 445 CURVE",
-"494 445 LINE SMOOTH",
-"386 445 OFFCURVE",
-"235 400 OFFCURVE",
-"235 224 CURVE SMOOTH",
-"235 72 OFFCURVE",
-"346 -11 OFFCURVE",
-"550 -11 CURVE SMOOTH",
-"676 -11 OFFCURVE",
-"783 53 OFFCURVE",
-"844 99 CURVE",
-"844 162 LINE",
-"809 162 OFFCURVE",
-"750 162 OFFCURVE",
-"708 162 CURVE",
-"696 140 OFFCURVE",
-"646 129 OFFCURVE",
-"608 129 CURVE SMOOTH",
-"473 129 OFFCURVE",
-"413 154 OFFCURVE",
-"413 229 CURVE SMOOTH",
-"413 326 OFFCURVE",
-"505 330 OFFCURVE",
-"540 330 CURVE SMOOTH",
-"826 330 LINE"
-);
+name = "sanyaka-sinh";
+transform = "{1, 0, 0, 1, -24, 0}";
 }
 );
+layerId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
 width = 864;
 },
 {
@@ -738,6 +469,107 @@ nodes = (
 }
 );
 width = 665;
+},
+{
+associatedMasterId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
+layerId = "C6B02482-A1DB-48EB-B49F-7C486E211DD4";
+name = "29 Dec 24 at 16:33";
+paths = (
+{
+closed = 1;
+nodes = (
+"250 -244 OFFCURVE",
+"336 -291 OFFCURVE",
+"428 -291 CURVE SMOOTH",
+"844 -291 LINE",
+"844 147 LINE",
+"714 147 LINE",
+"714 -157 LINE",
+"479 -157 LINE SMOOTH",
+"409 -157 OFFCURVE",
+"367 -140 OFFCURVE",
+"399 -52 CURVE",
+"268 -51 LINE",
+"251 -96 OFFCURVE",
+"250 -129 OFFCURVE",
+"250 -150 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"20 150 OFFCURVE",
+"69 -5 OFFCURVE",
+"223 -5 CURVE",
+"223 38 OFFCURVE",
+"224 91 OFFCURVE",
+"224 133 CURVE",
+"181 133 OFFCURVE",
+"160 188 OFFCURVE",
+"160 299 CURVE SMOOTH",
+"160 402 OFFCURVE",
+"198 510 OFFCURVE",
+"325 510 CURVE SMOOTH",
+"358 510 OFFCURVE",
+"410 498 OFFCURVE",
+"417 467 CURVE",
+"503 536 LINE",
+"482 574 OFFCURVE",
+"417 622 OFFCURVE",
+"290 622 CURVE SMOOTH",
+"110 622 OFFCURVE",
+"20 503 OFFCURVE",
+"20 300 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"826 439 LINE SMOOTH",
+"826 514 OFFCURVE",
+"773 622 OFFCURVE",
+"620 622 CURVE SMOOTH",
+"515 622 OFFCURVE",
+"463 586 OFFCURVE",
+"438 498 CURVE",
+"430 487 OFFCURVE",
+"425 481 OFFCURVE",
+"417 467 CURVE",
+"548 467 LINE",
+"555 486 OFFCURVE",
+"572 506 OFFCURVE",
+"617 506 CURVE SMOOTH",
+"667 506 OFFCURVE",
+"693 479 OFFCURVE",
+"690 445 CURVE",
+"494 445 LINE SMOOTH",
+"386 445 OFFCURVE",
+"235 400 OFFCURVE",
+"235 224 CURVE SMOOTH",
+"235 72 OFFCURVE",
+"346 -11 OFFCURVE",
+"550 -11 CURVE SMOOTH",
+"676 -11 OFFCURVE",
+"783 53 OFFCURVE",
+"844 99 CURVE",
+"844 162 LINE",
+"809 162 OFFCURVE",
+"750 162 OFFCURVE",
+"708 162 CURVE",
+"696 140 OFFCURVE",
+"646 129 OFFCURVE",
+"608 129 CURVE SMOOTH",
+"473 129 OFFCURVE",
+"413 154 OFFCURVE",
+"413 229 CURVE SMOOTH",
+"413 326 OFFCURVE",
+"505 330 OFFCURVE",
+"540 330 CURVE SMOOTH",
+"826 330 LINE"
+);
+}
+);
+width = 864;
 }
 );
 leftMetricsKey = gasinh;
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/nnasinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/nnasinh.glyph
index 48e428fc..d865190f 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/nnasinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/nnasinh.glyph
@@ -155,7 +155,7 @@ width = 1152;
 anchors = (
 {
 name = uvowel;
-position = "{1146.388, 176}";
+position = "{1126, 176}";
 },
 {
 name = virama;
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/nngasinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/nngasinh.glyph
index 7035e691..c1067c9d 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/nngasinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/nngasinh.glyph
@@ -92,7 +92,7 @@ transform = "{1, 0, 0, 1, 192, 0}";
 },
 {
 name = "sanyaka-sinh";
-transform = "{1, 0, 0, 1, 20, 0}";
+transform = "{1, 0, 0, 1, -20, 0}";
 }
 );
 layerId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/nyasinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/nyasinh.glyph
index 455ce663..91aa8f5b 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/nyasinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/nyasinh.glyph
@@ -10,679 +10,144 @@ position = "{746, 730}";
 },
 {
 name = top;
-position = "{733, 533}";
+position = "{672, 562}";
 },
 {
 name = virama;
-position = "{1103, 536}";
+position = "{1228.309, 536}";
 }
 );
-layerId = "7977A986-4EFB-4152-84F8-5A02CD382AAF";
-paths = (
-{
-closed = 1;
-nodes = (
-"735 -11 OFFCURVE",
-"776 74 OFFCURVE",
-"776 193 CURVE SMOOTH",
-"776 353 OFFCURVE",
-"684 448 OFFCURVE",
-"515 448 CURVE SMOOTH",
-"443 448 OFFCURVE",
-"389 431 OFFCURVE",
-"356 413 CURVE",
-"315 376 LINE",
-"392 410 OFFCURVE",
-"434 422 OFFCURVE",
-"514 422 CURVE SMOOTH",
-"669 422 OFFCURVE",
-"753 338 OFFCURVE",
-"753 193 CURVE SMOOTH",
-"753 106 OFFCURVE",
-"729 15 OFFCURVE",
-"620 15 CURVE SMOOTH",
-"546 15 OFFCURVE",
-"493 66 OFFCURVE",
-"493 166 CURVE SMOOTH",
-"493 204 LINE",
-"467 204 LINE",
-"467 166 LINE SMOOTH",
-"467 84 OFFCURVE",
-"431 15 OFFCURVE",
-"342 15 CURVE SMOOTH",
-"238 15 OFFCURVE",
-"222 101 OFFCURVE",
-"222 170 CURVE SMOOTH",
-"222 181 OFFCURVE",
-"223 191 OFFCURVE",
-"225 204 CURVE",
-"199 204 LINE",
-"197 196 OFFCURVE",
-"195 181 OFFCURVE",
-"195 170 CURVE SMOOTH",
-"195 21 OFFCURVE",
-"274 -11 OFFCURVE",
-"342 -11 CURVE SMOOTH",
-"407 -11 OFFCURVE",
-"456 19 OFFCURVE",
-"480 98 CURVE",
-"497 41 OFFCURVE",
-"537 -11 OFFCURVE",
-"623 -11 CURVE SMOOTH"
-);
-},
-{
-closed = 1;
-nodes = (
-"809 586 OFFCURVE",
-"873 566 OFFCURVE",
-"925 533 CURVE",
-"935 557 LINE",
-"885 587 OFFCURVE",
-"825 612 OFFCURVE",
-"733 612 CURVE SMOOTH",
-"595 612 OFFCURVE",
-"504 571 OFFCURVE",
-"397 476 CURVE SMOOTH",
-"391 471 LINE SMOOTH",
-"315 395 OFFCURVE",
-"228 283 OFFCURVE",
-"149 171 CURVE",
-"173 156 LINE",
-"198 193 LINE",
-"205 202 LINE",
-"256 274 OFFCURVE",
-"308 343 OFFCURVE",
-"360 401 CURVE",
-"371 415 LINE",
-"495 544 OFFCURVE",
-"598 586 OFFCURVE",
-"730 586 CURVE SMOOTH"
-);
-},
+components = (
 {
-closed = 1;
-nodes = (
-"226 591 OFFCURVE",
-"177 540 OFFCURVE",
-"177 473 CURVE SMOOTH",
-"177 455 OFFCURVE",
-"181 421 OFFCURVE",
-"189 395 CURVE",
-"215 400 LINE",
-"209 421 OFFCURVE",
-"204 445 OFFCURVE",
-"204 473 CURVE SMOOTH",
-"204 538 OFFCURVE",
-"239 565 OFFCURVE",
-"285 565 CURVE SMOOTH",
-"342 565 OFFCURVE",
-"366 522 OFFCURVE",
-"384 458 CURVE",
-"406 470 LINE",
-"388 533 OFFCURVE",
-"359 591 OFFCURVE",
-"285 591 CURVE SMOOTH"
-);
+name = _part.ka;
+transform = "{1, 0, 0, 1, 230, 0}";
 },
 {
-closed = 1;
-nodes = (
-"41 216 OFFCURVE",
-"75 147 OFFCURVE",
-"122 72 CURVE",
-"147 87 LINE",
-"104 144 OFFCURVE",
-"68 218 OFFCURVE",
-"68 320 CURVE SMOOTH",
-"68 459 OFFCURVE",
-"148 554 OFFCURVE",
-"253 569 CURVE",
-"272 590 LINE",
-"122 587 OFFCURVE",
-"41 463 OFFCURVE",
-"41 320 CURVE SMOOTH"
-);
-},
-{
-closed = 1;
-nodes = (
-"1088 -11 OFFCURVE",
-"1144 2 OFFCURVE",
-"1207 38 CURVE",
-"1195 61 LINE",
-"1133 28 OFFCURVE",
-"1090 15 OFFCURVE",
-"1017 15 CURVE SMOOTH",
-"863 15 OFFCURVE",
-"778 90 OFFCURVE",
-"778 232 CURVE SMOOTH",
-"778 307 OFFCURVE",
-"804 357 OFFCURVE",
-"849 387 CURVE SMOOTH",
-"894 418 OFFCURVE",
-"955 429 OFFCURVE",
-"1071 429 CURVE SMOOTH",
-"1185 429 LINE",
-"1185 445 LINE SMOOTH",
-"1185 545 OFFCURVE",
-"1132 612 OFFCURVE",
-"1030 612 CURVE SMOOTH",
-"946 612 OFFCURVE",
-"900 562 OFFCURVE",
-"900 500 CURVE SMOOTH",
-"900 492 OFFCURVE",
-"900 481 OFFCURVE",
-"902 470 CURVE",
-"929 473 LINE",
-"928 480 OFFCURVE",
-"927 489 OFFCURVE",
-"927 498 CURVE SMOOTH",
-"927 556 OFFCURVE",
-"964 586 OFFCURVE",
-"1030 586 CURVE SMOOTH",
-"1106 586 OFFCURVE",
-"1156 540 OFFCURVE",
-"1159 455 CURVE",
-"1054 455 LINE SMOOTH",
-"939 455 OFFCURVE",
-"878 441 OFFCURVE",
-"827 404 CURVE SMOOTH",
-"778 369 OFFCURVE",
-"756 318 OFFCURVE",
-"756 232 CURVE SMOOTH",
-"756 76 OFFCURVE",
-"844 -11 OFFCURVE",
-"1015 -11 CURVE SMOOTH"
+name = dasinh;
+transform = "{1, 0, 0, 1, 810, 0}";
+}
 );
-},
+layerId = "7977A986-4EFB-4152-84F8-5A02CD382AAF";
+paths = (
 {
 closed = 1;
 nodes = (
-"1180 -271 OFFCURVE",
-"1215 -268 OFFCURVE",
-"1235 -257 CURVE",
-"1229 -233 LINE",
-"1211 -240 OFFCURVE",
-"1185 -245 OFFCURVE",
-"1161 -245 CURVE SMOOTH",
-"1072 -245 OFFCURVE",
-"1044 -197 OFFCURVE",
-"1044 -142 CURVE SMOOTH",
-"1044 -80 OFFCURVE",
-"1086 -27 OFFCURVE",
-"1144 13 CURVE",
-"1125 19 LINE",
-"1108 15 LINE",
-"1058 -23 OFFCURVE",
-"1017 -75 OFFCURVE",
-"1017 -142 CURVE SMOOTH",
-"1017 -209 OFFCURVE",
-"1056 -271 OFFCURVE",
-"1161 -271 CURVE SMOOTH"
+"41 178 OFFCURVE",
+"78 79 OFFCURVE",
+"143 0 CURVE",
+"168 13 LINE",
+"104 86 OFFCURVE",
+"68 180 OFFCURVE",
+"68 255 CURVE SMOOTH",
+"68 453 OFFCURVE",
+"204 568 OFFCURVE",
+"381 568 CURVE",
+"380 590 LINE",
+"187 590 OFFCURVE",
+"41 467 OFFCURVE",
+"41 256 CURVE SMOOTH"
 );
 }
 );
-width = 1221;
+width = 1350;
 },
 {
 anchors = (
 {
 name = repaya;
-position = "{795, 730}";
+position = "{855, 730}";
 },
 {
 name = top;
-position = "{782, 573}";
+position = "{842, 573}";
 },
 {
 name = virama;
-position = "{1176.143, 536}";
+position = "{1236, 536}";
 }
 );
-layerId = UUID0;
-paths = (
-{
-closed = 1;
-nodes = (
-"797 -11 OFFCURVE",
-"844 79 OFFCURVE",
-"844 192 CURVE SMOOTH",
-"844 361 OFFCURVE",
-"748 448 OFFCURVE",
-"578 448 CURVE SMOOTH",
-"505 448 OFFCURVE",
-"452 432 OFFCURVE",
-"427 415 CURVE",
-"329 334 LINE",
-"423 372 OFFCURVE",
-"472 380 OFFCURVE",
-"564 380 CURVE SMOOTH",
-"712 380 OFFCURVE",
-"784 309 OFFCURVE",
-"784 191 CURVE SMOOTH",
-"784 119 OFFCURVE",
-"759 60 OFFCURVE",
-"681 60 CURVE SMOOTH",
-"612 60 OFFCURVE",
-"576 120 OFFCURVE",
-"576 204 CURVE SMOOTH",
-"576 214 LINE",
-"509 214 LINE",
-"509 208 LINE SMOOTH",
-"509 107 OFFCURVE",
-"475 60 OFFCURVE",
-"407 60 CURVE SMOOTH",
-"326 60 OFFCURVE",
-"307 115 OFFCURVE",
-"307 187 CURVE SMOOTH",
-"307 196 OFFCURVE",
-"308 205 OFFCURVE",
-"309 214 CURVE",
-"247 214 LINE",
-"244 200 OFFCURVE",
-"242 184 OFFCURVE",
-"242 170 CURVE SMOOTH",
-"242 22 OFFCURVE",
-"335 -11 OFFCURVE",
-"402 -11 CURVE SMOOTH",
-"467 -11 OFFCURVE",
-"509 15 OFFCURVE",
-"542 77 CURVE",
-"570 30 OFFCURVE",
-"615 -11 OFFCURVE",
-"689 -11 CURVE SMOOTH"
-);
-},
-{
-closed = 1;
-nodes = (
-"863 544 OFFCURVE",
-"924 528 OFFCURVE",
-"984 500 CURVE",
-"1025 561 LINE",
-"947 596 OFFCURVE",
-"882 612 OFFCURVE",
-"784 612 CURVE SMOOTH",
-"639 612 OFFCURVE",
-"538 578 OFFCURVE",
-"421 479 CURVE",
-"400 461 LINE",
-"328 396 OFFCURVE",
-"265 321 OFFCURVE",
-"165 180 CURVE",
-"229 144 LINE",
-"254 188 LINE",
-"273 208 LINE",
-"321 276 OFFCURVE",
-"366 335 OFFCURVE",
-"413 385 CURVE",
-"438 410 LINE",
-"529 498 OFFCURVE",
-"630 544 OFFCURVE",
-"790 544 CURVE SMOOTH"
-);
-},
-{
-closed = 1;
-nodes = (
-"241 592 OFFCURVE",
-"177 542 OFFCURVE",
-"177 467 CURVE SMOOTH",
-"177 446 OFFCURVE",
-"182 415 OFFCURVE",
-"190 389 CURVE",
-"260 403 LINE",
-"255 420 OFFCURVE",
-"249 437 OFFCURVE",
-"249 459 CURVE SMOOTH",
-"249 506 OFFCURVE",
-"275 526 OFFCURVE",
-"312 526 CURVE SMOOTH",
-"370 526 OFFCURVE",
-"388 465 OFFCURVE",
-"396 398 CURVE",
-"454 434 LINE",
-"447 509 OFFCURVE",
-"409 592 OFFCURVE",
-"311 592 CURVE SMOOTH"
-);
-},
+components = (
 {
-closed = 1;
-nodes = (
-"36 202 OFFCURVE",
-"72 123 OFFCURVE",
-"119 53 CURVE",
-"184 91 LINE",
-"138 156 OFFCURVE",
-"109 214 OFFCURVE",
-"109 303 CURVE SMOOTH",
-"109 417 OFFCURVE",
-"157 488 OFFCURVE",
-"244 519 CURVE",
-"302 591 LINE",
-"142 591 OFFCURVE",
-"36 472 OFFCURVE",
-"36 307 CURVE SMOOTH"
-);
+name = _part.ka;
+transform = "{1, 0, 0, 1, 233, 0}";
 },
 {
-closed = 1;
-nodes = (
-"1141 -11 OFFCURVE",
-"1216 -2 OFFCURVE",
-"1290 37 CURVE",
-"1269 104 LINE",
-"1206 73 OFFCURVE",
-"1149 60 OFFCURVE",
-"1083 60 CURVE SMOOTH",
-"915 60 OFFCURVE",
-"855 142 OFFCURVE",
-"855 229 CURVE SMOOTH",
-"855 286 OFFCURVE",
-"875 328 OFFCURVE",
-"911 352 CURVE SMOOTH",
-"949 377 OFFCURVE",
-"989 389 OFFCURVE",
-"1114 389 CURVE SMOOTH",
-"1268 389 LINE",
-"1268 430 LINE SMOOTH",
-"1268 549 OFFCURVE",
-"1206 612 OFFCURVE",
-"1096 612 CURVE SMOOTH",
-"1014 612 OFFCURVE",
-"949 574 OFFCURVE",
-"949 499 CURVE SMOOTH",
-"949 488 OFFCURVE",
-"950 478 OFFCURVE",
-"951 468 CURVE",
-"1023 477 LINE",
-"1022 481 OFFCURVE",
-"1022 487 OFFCURVE",
-"1022 492 CURVE SMOOTH",
-"1022 525 OFFCURVE",
-"1049 546 OFFCURVE",
-"1101 546 CURVE SMOOTH",
-"1154 546 OFFCURVE",
-"1193 517 OFFCURVE",
-"1197 455 CURVE",
-"1112 455 LINE SMOOTH",
-"998 455 OFFCURVE",
-"924 442 OFFCURVE",
-"867 401 CURVE SMOOTH",
-"819 367 OFFCURVE",
-"792 313 OFFCURVE",
-"792 233 CURVE SMOOTH",
-"792 72 OFFCURVE",
-"898 -11 OFFCURVE",
-"1075 -11 CURVE SMOOTH"
+name = dasinh;
+transform = "{1, 0, 0, 1, 800, 0}";
+}
 );
-},
+layerId = UUID0;
+paths = (
 {
 closed = 1;
 nodes = (
-"1248 -271 OFFCURVE",
-"1281 -267 OFFCURVE",
-"1313 -252 CURVE",
-"1297 -188 LINE",
-"1275 -198 OFFCURVE",
-"1250 -203 OFFCURVE",
-"1226 -203 CURVE SMOOTH",
-"1163 -203 OFFCURVE",
-"1130 -175 OFFCURVE",
-"1130 -119 CURVE SMOOTH",
-"1130 -62 OFFCURVE",
-"1168 -10 OFFCURVE",
-"1234 28 CURVE",
-"1216 69 LINE",
-"1182 56 LINE",
-"1104 13 OFFCURVE",
-"1056 -47 OFFCURVE",
-"1056 -121 CURVE SMOOTH",
-"1056 -214 OFFCURVE",
-"1111 -271 OFFCURVE",
-"1210 -271 CURVE SMOOTH"
+"36 158 OFFCURVE",
+"72 71 OFFCURVE",
+"119 0 CURVE",
+"185 34 LINE",
+"140 99 OFFCURVE",
+"109 180 OFFCURVE",
+"109 268 CURVE SMOOTH",
+"109 431 OFFCURVE",
+"193 538 OFFCURVE",
+"395 538 CURVE",
+"390 592 LINE",
+"165 592 OFFCURVE",
+"36 487 OFFCURVE",
+"36 263 CURVE SMOOTH"
 );
 }
 );
-width = 1303;
+width = 1377;
 },
 {
 anchors = (
 {
 name = repaya;
-position = "{865, 730}";
+position = "{885, 730}";
 },
 {
 name = top;
-position = "{850, 533}";
+position = "{872, 573}";
 },
 {
 name = virama;
-position = "{1287, 536}";
+position = "{1266, 536}";
 }
 );
-layerId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
-paths = (
-{
-closed = 1;
-nodes = (
-"20 126 OFFCURVE",
-"76 -5 OFFCURVE",
-"224 -5 CURVE",
-"224 38 OFFCURVE",
-"225 82 OFFCURVE",
-"225 124 CURVE",
-"175 124 OFFCURVE",
-"147 178 OFFCURVE",
-"147 294 CURVE SMOOTH",
-"147 397 OFFCURVE",
-"159 508 OFFCURVE",
-"218 508 CURVE SMOOTH",
-"244 508 OFFCURVE",
-"257 484 OFFCURVE",
-"259 463 CURVE",
-"335 514 LINE",
-"308 581 OFFCURVE",
-"253 620 OFFCURVE",
-"193 620 CURVE SMOOTH",
-"65 620 OFFCURVE",
-"20 500 OFFCURVE",
-"20 297 CURVE SMOOTH"
-);
-},
-{
-closed = 0;
-nodes = (
-"389 605 LINE",
-"274 605 OFFCURVE",
-"230 514 OFFCURVE",
-"225 437 CURVE SMOOTH"
-);
-},
-{
-closed = 1;
-nodes = (
-"870 -11 OFFCURVE",
-"893 124 OFFCURVE",
-"893 214 CURVE SMOOTH",
-"893 344 OFFCURVE",
-"846 436 OFFCURVE",
-"664 436 CURVE SMOOTH",
-"593 436 OFFCURVE",
-"511 403 OFFCURVE",
-"457 372 CURVE",
-"385 297 LINE",
-"464 314 OFFCURVE",
-"526 338 OFFCURVE",
-"591 338 CURVE SMOOTH",
-"748 338 OFFCURVE",
-"786 284 OFFCURVE",
-"786 216 CURVE SMOOTH",
-"786 175 OFFCURVE",
-"774 137 OFFCURVE",
-"727 137 CURVE SMOOTH",
-"668 137 OFFCURVE",
-"653 178 OFFCURVE",
-"653 255 CURVE SMOOTH",
-"653 263 LINE",
-"528 263 LINE",
-"528 250 LINE SMOOTH",
-"528 182 OFFCURVE",
-"497 137 OFFCURVE",
-"453 137 CURVE SMOOTH",
-"419 137 OFFCURVE",
-"404 165 OFFCURVE",
-"404 203 CURVE SMOOTH",
-"404 235 OFFCURVE",
-"407 257 OFFCURVE",
-"408 263 CURVE",
-"334 261 LINE",
-"323 232 OFFCURVE",
-"321 179 OFFCURVE",
-"309 115 CURVE",
-"309 69 OFFCURVE",
-"343 -11 OFFCURVE",
-"458 -11 CURVE SMOOTH",
-"532 -11 OFFCURVE",
-"578 24 OFFCURVE",
-"591 101 CURVE",
-"603 24 OFFCURVE",
-"654 -11 OFFCURVE",
-"728 -11 CURVE SMOOTH"
-);
-},
-{
-closed = 1;
-nodes = (
-"974 465 OFFCURVE",
-"1018 465 OFFCURVE",
-"1048 465 CURVE",
-"1035 556 OFFCURVE",
-"947 622 OFFCURVE",
-"807 622 CURVE SMOOTH",
-"662 622 OFFCURVE",
-"596 578 OFFCURVE",
-"489 478 CURVE",
-"463 467 LINE",
-"391 407 OFFCURVE",
-"282 297 OFFCURVE",
-"195 195 CURVE",
-"272 129 LINE",
-"326 157 LINE",
-"356 195 LINE",
-"409 257 OFFCURVE",
-"453 305 OFFCURVE",
-"537 368 CURVE",
-"571 409 LINE",
-"633 448 OFFCURVE",
-"696 505 OFFCURVE",
-"805 505 CURVE SMOOTH",
-"884 505 OFFCURVE",
-"940 478 OFFCURVE",
-"947 465 CURVE"
-);
-},
+components = (
 {
-closed = 1;
-nodes = (
-"274 605 OFFCURVE",
-"230 514 OFFCURVE",
-"225 437 CURVE SMOOTH",
-"225 432 OFFCURVE",
-"225 427 OFFCURVE",
-"225 422 CURVE",
-"365 422 LINE",
-"365 454 OFFCURVE",
-"383 491 OFFCURVE",
-"414 491 CURVE SMOOTH",
-"438 491 OFFCURVE",
-"450 473 OFFCURVE",
-"450 457 CURVE SMOOTH",
-"450 444 OFFCURVE",
-"447 431 OFFCURVE",
-"435 416 CURVE",
-"528 430 LINE",
-"540 455 OFFCURVE",
-"546 478 OFFCURVE",
-"546 499 CURVE SMOOTH",
-"544 565 OFFCURVE",
-"478 605 OFFCURVE",
-"389 605 CURVE SMOOTH"
-);
+name = _part.ka;
+transform = "{1, 0, 0, 1, 240, 0}";
 },
 {
-closed = 1;
-nodes = (
-"1017 445 LINE SMOOTH",
-"909 445 OFFCURVE",
-"795 379 OFFCURVE",
-"795 224 CURVE SMOOTH",
-"795 72 OFFCURVE",
-"899 -11 OFFCURVE",
-"1096 -11 CURVE SMOOTH",
-"1220 -11 OFFCURVE",
-"1280 -5 OFFCURVE",
-"1360 24 CURVE",
-"1360 151 LINE",
-"1285 126 OFFCURVE",
-"1209 116 OFFCURVE",
-"1131 116 CURVE SMOOTH",
-"996 116 OFFCURVE",
-"936 154 OFFCURVE",
-"936 229 CURVE SMOOTH",
-"936 326 OFFCURVE",
-"1028 330 OFFCURVE",
-"1063 330 CURVE SMOOTH",
-"1349 330 LINE",
-"1349 439 LINE SMOOTH",
-"1349 514 OFFCURVE",
-"1296 622 OFFCURVE",
-"1143 622 CURVE SMOOTH",
-"1038 622 OFFCURVE",
-"945 580 OFFCURVE",
-"945 489 CURVE SMOOTH",
-"945 473 OFFCURVE",
-"945 477 OFFCURVE",
-"947 465 CURVE",
-"1048 465 LINE",
-"1056 484 OFFCURVE",
-"1077 505 OFFCURVE",
-"1128 505 CURVE SMOOTH",
-"1191 505 OFFCURVE",
-"1216 479 OFFCURVE",
-"1213 445 CURVE"
+name = dasinh;
+transform = "{1, 0, 0, 1, 820, 0}";
+}
 );
-},
+layerId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
+paths = (
 {
 closed = 1;
 nodes = (
-"1293 -271 OFFCURVE",
-"1320 -262 OFFCURVE",
-"1362 -248 CURVE",
-"1362 -126 LINE",
-"1337 -135 OFFCURVE",
-"1308 -141 OFFCURVE",
-"1279 -141 CURVE SMOOTH",
-"1239 -141 OFFCURVE",
-"1212 -123 OFFCURVE",
-"1212 -90 CURVE SMOOTH",
-"1212 -48 OFFCURVE",
-"1261 -9 OFFCURVE",
-"1336 16 CURVE",
-"1309 61 LINE",
-"1251 46 LINE",
-"1106 -7 OFFCURVE",
-"1056 -56 OFFCURVE",
-"1056 -136 CURVE SMOOTH",
-"1056 -211 OFFCURVE",
-"1121 -271 OFFCURVE",
-"1243 -271 CURVE SMOOTH"
+"20 164 OFFCURVE",
+"50 70 OFFCURVE",
+"103 0 CURVE",
+"239 38 LINE",
+"186 116 OFFCURVE",
+"160 188 OFFCURVE",
+"160 261 CURVE SMOOTH",
+"160 352 OFFCURVE",
+"199 488 OFFCURVE",
+"372 488 CURVE",
+"418 606 LINE",
+"162 606 OFFCURVE",
+"20 493 OFFCURVE",
+"20 262 CURVE SMOOTH"
 );
 }
 );
-width = 1373;
+width = 1455;
 },
 {
 anchors = (
@@ -1373,231 +838,210 @@ width = 1438;
 anchors = (
 {
 name = repaya;
-position = "{880.747, 730}";
+position = "{959, 730}";
 },
 {
 name = top;
-position = "{866, 533}";
-},
-{
-name = virama;
-position = "{1303, 536}";
-}
-);
-associatedMasterId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
-layerId = "2B334369-4D2A-450E-8F3D-3B7AD67A29EA";
-name = "28 Dec 24, 16:52";
-paths = (
-{
-closed = 1;
-nodes = (
-"36 126 OFFCURVE",
-"92 -5 OFFCURVE",
-"240 -5 CURVE",
-"240 38 OFFCURVE",
-"241 82 OFFCURVE",
-"241 124 CURVE",
-"191 124 OFFCURVE",
-"163 178 OFFCURVE",
-"163 294 CURVE SMOOTH",
-"163 397 OFFCURVE",
-"175 508 OFFCURVE",
-"234 508 CURVE SMOOTH",
-"260 508 OFFCURVE",
-"273 484 OFFCURVE",
-"275 463 CURVE",
-"351 514 LINE",
-"324 581 OFFCURVE",
-"269 620 OFFCURVE",
-"209 620 CURVE SMOOTH",
-"81 620 OFFCURVE",
-"36 500 OFFCURVE",
-"36 297 CURVE SMOOTH"
-);
-},
-{
-closed = 0;
-nodes = (
-"405 605 LINE",
-"290 605 OFFCURVE",
-"246 514 OFFCURVE",
-"241 437 CURVE SMOOTH"
-);
+position = "{944, 533}";
 },
-{
-closed = 1;
-nodes = (
-"886 -11 OFFCURVE",
-"909 124 OFFCURVE",
-"909 214 CURVE SMOOTH",
-"909 344 OFFCURVE",
-"862 436 OFFCURVE",
-"680 436 CURVE SMOOTH",
-"609 436 OFFCURVE",
-"527 403 OFFCURVE",
-"473 372 CURVE",
-"401 297 LINE",
-"480 314 OFFCURVE",
-"542 338 OFFCURVE",
-"607 338 CURVE SMOOTH",
-"764 338 OFFCURVE",
-"802 284 OFFCURVE",
-"802 216 CURVE SMOOTH",
-"802 175 OFFCURVE",
-"790 137 OFFCURVE",
-"743 137 CURVE SMOOTH",
-"684 137 OFFCURVE",
-"669 178 OFFCURVE",
-"669 255 CURVE SMOOTH",
-"669 263 LINE",
-"544 263 LINE",
-"544 250 LINE SMOOTH",
-"544 182 OFFCURVE",
+{
+name = virama;
+position = "{1381, 536}";
+}
+);
+associatedMasterId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
+components = (
+{
+name = "sanyaka-sinh";
+transform = "{1, 0, 0, 1, 30, 0}";
+}
+);
+layerId = "2B334369-4D2A-450E-8F3D-3B7AD67A29EA";
+name = "28 Dec 24, 16:52";
+paths = (
+{
+closed = 0;
+nodes = (
+"483 605 LINE",
+"368 605 OFFCURVE",
+"324 514 OFFCURVE",
+"319 437 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"964 -11 OFFCURVE",
+"987 124 OFFCURVE",
+"987 214 CURVE SMOOTH",
+"987 344 OFFCURVE",
+"940 436 OFFCURVE",
+"758 436 CURVE SMOOTH",
+"687 436 OFFCURVE",
+"605 403 OFFCURVE",
+"551 372 CURVE",
+"479 297 LINE",
+"558 314 OFFCURVE",
+"620 338 OFFCURVE",
+"685 338 CURVE SMOOTH",
+"842 338 OFFCURVE",
+"880 284 OFFCURVE",
+"880 216 CURVE SMOOTH",
+"880 175 OFFCURVE",
+"868 137 OFFCURVE",
+"821 137 CURVE SMOOTH",
+"762 137 OFFCURVE",
+"747 178 OFFCURVE",
+"747 255 CURVE SMOOTH",
+"747 263 LINE",
+"622 263 LINE",
+"622 250 LINE SMOOTH",
+"622 182 OFFCURVE",
+"591 137 OFFCURVE",
+"547 137 CURVE SMOOTH",
 "513 137 OFFCURVE",
-"469 137 CURVE SMOOTH",
-"435 137 OFFCURVE",
-"420 165 OFFCURVE",
-"420 203 CURVE SMOOTH",
-"420 235 OFFCURVE",
-"423 257 OFFCURVE",
-"424 263 CURVE",
-"350 261 LINE",
-"339 232 OFFCURVE",
-"337 179 OFFCURVE",
-"325 115 CURVE",
-"325 69 OFFCURVE",
-"359 -11 OFFCURVE",
-"474 -11 CURVE SMOOTH",
-"548 -11 OFFCURVE",
-"594 24 OFFCURVE",
-"607 101 CURVE",
-"619 24 OFFCURVE",
-"670 -11 OFFCURVE",
-"744 -11 CURVE SMOOTH"
+"498 165 OFFCURVE",
+"498 203 CURVE SMOOTH",
+"498 235 OFFCURVE",
+"501 257 OFFCURVE",
+"502 263 CURVE",
+"428 261 LINE",
+"417 232 OFFCURVE",
+"415 179 OFFCURVE",
+"403 115 CURVE",
+"403 69 OFFCURVE",
+"437 -11 OFFCURVE",
+"552 -11 CURVE SMOOTH",
+"626 -11 OFFCURVE",
+"672 24 OFFCURVE",
+"685 101 CURVE",
+"697 24 OFFCURVE",
+"748 -11 OFFCURVE",
+"822 -11 CURVE SMOOTH"
 );
 },
 {
 closed = 1;
 nodes = (
-"978 578 OFFCURVE",
-"956 635 CURVE",
-"739 635 OFFCURVE",
-"612 578 OFFCURVE",
-"505 478 CURVE",
-"479 467 LINE",
-"407 407 OFFCURVE",
-"298 297 OFFCURVE",
-"211 195 CURVE",
-"288 129 LINE",
-"342 157 LINE",
-"372 195 LINE",
-"425 257 OFFCURVE",
-"469 305 OFFCURVE",
-"553 368 CURVE",
-"587 409 LINE",
-"649 448 OFFCURVE",
-"699 518 OFFCURVE",
-"956 518 CURVE",
-"983 562 OFFCURVE"
+"1061 562 OFFCURVE",
+"1056 578 OFFCURVE",
+"1034 635 CURVE",
+"817 635 OFFCURVE",
+"690 578 OFFCURVE",
+"583 478 CURVE",
+"557 467 LINE",
+"485 407 OFFCURVE",
+"376 297 OFFCURVE",
+"289 195 CURVE",
+"366 129 LINE",
+"420 157 LINE",
+"450 195 LINE",
+"503 257 OFFCURVE",
+"547 305 OFFCURVE",
+"631 368 CURVE",
+"665 409 LINE",
+"727 448 OFFCURVE",
+"777 518 OFFCURVE",
+"1034 518 CURVE"
 );
 },
 {
 closed = 1;
 nodes = (
-"290 605 OFFCURVE",
-"246 514 OFFCURVE",
-"241 437 CURVE SMOOTH",
-"241 432 OFFCURVE",
-"241 427 OFFCURVE",
-"241 422 CURVE",
-"381 422 LINE",
-"381 454 OFFCURVE",
-"399 491 OFFCURVE",
-"430 491 CURVE SMOOTH",
-"454 491 OFFCURVE",
-"466 473 OFFCURVE",
-"466 457 CURVE SMOOTH",
-"466 444 OFFCURVE",
-"463 431 OFFCURVE",
-"451 416 CURVE",
-"544 430 LINE",
-"556 455 OFFCURVE",
-"562 478 OFFCURVE",
-"562 499 CURVE SMOOTH",
-"560 565 OFFCURVE",
-"494 605 OFFCURVE",
-"405 605 CURVE SMOOTH"
+"368 605 OFFCURVE",
+"324 514 OFFCURVE",
+"319 437 CURVE SMOOTH",
+"319 432 OFFCURVE",
+"319 427 OFFCURVE",
+"319 422 CURVE",
+"459 422 LINE",
+"459 454 OFFCURVE",
+"477 491 OFFCURVE",
+"508 491 CURVE SMOOTH",
+"532 491 OFFCURVE",
+"544 473 OFFCURVE",
+"544 457 CURVE SMOOTH",
+"544 444 OFFCURVE",
+"541 431 OFFCURVE",
+"529 416 CURVE",
+"622 430 LINE",
+"634 455 OFFCURVE",
+"640 478 OFFCURVE",
+"640 499 CURVE SMOOTH",
+"638 565 OFFCURVE",
+"572 605 OFFCURVE",
+"483 605 CURVE SMOOTH"
 );
 },
 {
 closed = 1;
 nodes = (
-"1175 420 OFFCURVE",
-"1101 445 OFFCURVE",
-"1010 445 CURVE SMOOTH",
-"902 445 OFFCURVE",
-"811 379 OFFCURVE",
-"811 224 CURVE SMOOTH",
-"811 72 OFFCURVE",
-"892 -11 OFFCURVE",
-"1089 -11 CURVE SMOOTH",
-"1213 -11 OFFCURVE",
-"1273 -5 OFFCURVE",
-"1353 24 CURVE",
-"1353 151 LINE",
-"1278 126 OFFCURVE",
-"1202 116 OFFCURVE",
-"1124 116 CURVE SMOOTH",
-"989 116 OFFCURVE",
-"929 154 OFFCURVE",
-"929 229 CURVE SMOOTH",
-"929 304 OFFCURVE",
-"987 330 OFFCURVE",
-"1052 330 CURVE SMOOTH",
-"1151 330 OFFCURVE",
-"1224 294 OFFCURVE",
-"1254 277 CURVE",
-"1342 277 LINE",
-"1342 376 LINE SMOOTH",
-"1342 473 OFFCURVE",
-"1236 635 OFFCURVE",
-"956 635 CURVE",
-"956 587 OFFCURVE",
-"956 549 OFFCURVE",
-"956 518 CURVE",
-"1106 518 OFFCURVE",
-"1212 452 OFFCURVE",
-"1225 389 CURVE"
+"1253 420 OFFCURVE",
+"1179 445 OFFCURVE",
+"1088 445 CURVE SMOOTH",
+"980 445 OFFCURVE",
+"889 379 OFFCURVE",
+"889 224 CURVE SMOOTH",
+"889 72 OFFCURVE",
+"970 -11 OFFCURVE",
+"1167 -11 CURVE SMOOTH",
+"1291 -11 OFFCURVE",
+"1351 -5 OFFCURVE",
+"1431 24 CURVE",
+"1431 151 LINE",
+"1356 126 OFFCURVE",
+"1280 116 OFFCURVE",
+"1202 116 CURVE SMOOTH",
+"1067 116 OFFCURVE",
+"1007 154 OFFCURVE",
+"1007 229 CURVE SMOOTH",
+"1007 304 OFFCURVE",
+"1065 330 OFFCURVE",
+"1130 330 CURVE SMOOTH",
+"1229 330 OFFCURVE",
+"1302 294 OFFCURVE",
+"1332 277 CURVE",
+"1420 277 LINE",
+"1420 376 LINE SMOOTH",
+"1420 473 OFFCURVE",
+"1314 635 OFFCURVE",
+"1034 635 CURVE",
+"1034 587 OFFCURVE",
+"1034 549 OFFCURVE",
+"1034 518 CURVE",
+"1184 518 OFFCURVE",
+"1290 452 OFFCURVE",
+"1303 389 CURVE"
 );
 },
 {
 closed = 1;
 nodes = (
-"1286 -271 OFFCURVE",
-"1313 -262 OFFCURVE",
-"1355 -248 CURVE",
-"1355 -126 LINE",
-"1330 -135 OFFCURVE",
-"1301 -141 OFFCURVE",
-"1272 -141 CURVE SMOOTH",
-"1232 -141 OFFCURVE",
-"1205 -123 OFFCURVE",
-"1205 -90 CURVE SMOOTH",
-"1205 -48 OFFCURVE",
-"1254 -9 OFFCURVE",
-"1329 16 CURVE",
-"1302 61 LINE",
-"1244 46 LINE",
-"1099 -7 OFFCURVE",
-"1049 -56 OFFCURVE",
-"1049 -136 CURVE SMOOTH",
-"1049 -211 OFFCURVE",
-"1114 -271 OFFCURVE",
-"1236 -271 CURVE SMOOTH"
+"1364 -271 OFFCURVE",
+"1391 -262 OFFCURVE",
+"1433 -248 CURVE",
+"1433 -126 LINE",
+"1408 -135 OFFCURVE",
+"1379 -141 OFFCURVE",
+"1350 -141 CURVE SMOOTH",
+"1310 -141 OFFCURVE",
+"1283 -123 OFFCURVE",
+"1283 -90 CURVE SMOOTH",
+"1283 -48 OFFCURVE",
+"1332 -9 OFFCURVE",
+"1407 16 CURVE",
+"1380 61 LINE",
+"1322 46 LINE",
+"1177 -7 OFFCURVE",
+"1127 -56 OFFCURVE",
+"1127 -136 CURVE SMOOTH",
+"1127 -211 OFFCURVE",
+"1192 -271 OFFCURVE",
+"1314 -271 CURVE SMOOTH"
 );
 }
 );
-width = 1438;
+width = 1444;
 },
 {
 anchors = (
@@ -1619,6 +1063,54 @@ paths = (
 {
 closed = 1;
 nodes = (
+"595 586 OFFCURVE",
+"646 570 OFFCURVE",
+"694 543 CURVE",
+"704 569 LINE",
+"650 597 OFFCURVE",
+"601 612 OFFCURVE",
+"544 612 CURVE SMOOTH",
+"453 612 OFFCURVE",
+"382 576 OFFCURVE",
+"308 475 CURVE",
+"301 468 LINE",
+"242 383 OFFCURVE",
+"184 277 OFFCURVE",
+"125 162 CURVE",
+"150 150 LINE",
+"171 198 LINE",
+"175 202 LINE",
+"210 272 OFFCURVE",
+"254 353 OFFCURVE",
+"290 406 CURVE SMOOTH",
+"296 416 LINE SMOOTH",
+"378 540 OFFCURVE",
+"449 586 OFFCURVE",
+"543 586 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"38 227 OFFCURVE",
+"66 139 OFFCURVE",
+"97 71 CURVE",
+"121 82 LINE",
+"91 146 OFFCURVE",
+"65 231 OFFCURVE",
+"65 331 CURVE SMOOTH",
+"65 447 OFFCURVE",
+"109 521 OFFCURVE",
+"183 563 CURVE",
+"224 590 LINE",
+"130 586 OFFCURVE",
+"38 497 OFFCURVE",
+"38 333 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
 "558 -11 OFFCURVE",
 "585 69 OFFCURVE",
 "585 189 CURVE SMOOTH",
@@ -1671,35 +1163,6 @@ nodes = (
 {
 closed = 1;
 nodes = (
-"595 586 OFFCURVE",
-"646 570 OFFCURVE",
-"694 543 CURVE",
-"704 569 LINE",
-"650 597 OFFCURVE",
-"601 612 OFFCURVE",
-"544 612 CURVE SMOOTH",
-"453 612 OFFCURVE",
-"382 576 OFFCURVE",
-"308 475 CURVE",
-"301 468 LINE",
-"242 383 OFFCURVE",
-"184 277 OFFCURVE",
-"125 162 CURVE",
-"150 150 LINE",
-"171 198 LINE",
-"175 202 LINE",
-"210 272 OFFCURVE",
-"254 353 OFFCURVE",
-"290 406 CURVE SMOOTH",
-"296 416 LINE SMOOTH",
-"378 540 OFFCURVE",
-"449 586 OFFCURVE",
-"543 586 CURVE SMOOTH"
-);
-},
-{
-closed = 1;
-nodes = (
 "180 591 OFFCURVE",
 "147 542 OFFCURVE",
 "147 480 CURVE SMOOTH",
@@ -1725,25 +1188,6 @@ nodes = (
 {
 closed = 1;
 nodes = (
-"38 227 OFFCURVE",
-"66 139 OFFCURVE",
-"97 71 CURVE",
-"121 82 LINE",
-"91 146 OFFCURVE",
-"65 231 OFFCURVE",
-"65 331 CURVE SMOOTH",
-"65 447 OFFCURVE",
-"109 521 OFFCURVE",
-"183 563 CURVE",
-"224 590 LINE",
-"130 586 OFFCURVE",
-"38 497 OFFCURVE",
-"38 333 CURVE SMOOTH"
-);
-},
-{
-closed = 1;
-nodes = (
 "810 -11 OFFCURVE",
 "851 -4 OFFCURVE",
 "899 26 CURVE",
@@ -1842,6 +1286,54 @@ paths = (
 {
 closed = 1;
 nodes = (
+"646 548 OFFCURVE",
+"694 532 OFFCURVE",
+"741 505 CURVE",
+"778 561 LINE",
+"719 593 OFFCURVE",
+"663 612 OFFCURVE",
+"596 612 CURVE SMOOTH",
+"490 612 OFFCURVE",
+"420 577 OFFCURVE",
+"336 479 CURVE SMOOTH",
+"321 462 LINE",
+"271 396 OFFCURVE",
+"214 309 OFFCURVE",
+"146 176 CURVE",
+"206 145 LINE",
+"223 190 LINE",
+"234 210 LINE",
+"272 288 OFFCURVE",
+"316 355 OFFCURVE",
+"355 409 CURVE",
+"366 420 LINE",
+"428 501 OFFCURVE",
+"490 548 OFFCURVE",
+"594 548 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"33 213 OFFCURVE",
+"62 121 OFFCURVE",
+"91 53 CURVE",
+"153 80 LINE",
+"119 157 OFFCURVE",
+"101 218 OFFCURVE",
+"101 310 CURVE SMOOTH",
+"101 418 OFFCURVE",
+"131 492 OFFCURVE",
+"197 528 CURVE",
+"255 591 LINE",
+"130 591 OFFCURVE",
+"33 488 OFFCURVE",
+"33 313 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
 "617 -11 OFFCURVE",
 "642 71 OFFCURVE",
 "642 196 CURVE SMOOTH",
@@ -1888,36 +1380,7 @@ nodes = (
 "429 68 CURVE",
 "452 20 OFFCURVE",
 "484 -11 OFFCURVE",
-"534 -11 CURVE SMOOTH"
-);
-},
-{
-closed = 1;
-nodes = (
-"646 548 OFFCURVE",
-"694 532 OFFCURVE",
-"741 505 CURVE",
-"778 561 LINE",
-"719 593 OFFCURVE",
-"663 612 OFFCURVE",
-"596 612 CURVE SMOOTH",
-"490 612 OFFCURVE",
-"420 577 OFFCURVE",
-"336 479 CURVE SMOOTH",
-"321 462 LINE",
-"271 396 OFFCURVE",
-"214 309 OFFCURVE",
-"146 176 CURVE",
-"206 145 LINE",
-"223 190 LINE",
-"234 210 LINE",
-"272 288 OFFCURVE",
-"316 355 OFFCURVE",
-"355 409 CURVE",
-"366 420 LINE",
-"428 501 OFFCURVE",
-"490 548 OFFCURVE",
-"594 548 CURVE SMOOTH"
+"534 -11 CURVE SMOOTH"
 );
 },
 {
@@ -1948,25 +1411,6 @@ nodes = (
 {
 closed = 1;
 nodes = (
-"33 213 OFFCURVE",
-"62 121 OFFCURVE",
-"91 53 CURVE",
-"153 80 LINE",
-"119 157 OFFCURVE",
-"101 218 OFFCURVE",
-"101 310 CURVE SMOOTH",
-"101 418 OFFCURVE",
-"131 492 OFFCURVE",
-"197 528 CURVE",
-"255 591 LINE",
-"130 591 OFFCURVE",
-"33 488 OFFCURVE",
-"33 313 CURVE SMOOTH"
-);
-},
-{
-closed = 1;
-nodes = (
 "876 -11 OFFCURVE",
 "916 -1 OFFCURVE",
 "966 32 CURVE",
@@ -2267,6 +1711,244 @@ nodes = (
 }
 );
 width = 1129;
+},
+{
+anchors = (
+{
+name = repaya;
+position = "{865, 730}";
+},
+{
+name = top;
+position = "{850, 533}";
+},
+{
+name = virama;
+position = "{1287, 536}";
+}
+);
+associatedMasterId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
+layerId = "67276C6E-BB88-4B1A-9A08-04DB6AD2A54D";
+name = "29 Dec 24 at 16:40";
+paths = (
+{
+closed = 1;
+nodes = (
+"20 126 OFFCURVE",
+"76 -5 OFFCURVE",
+"224 -5 CURVE",
+"224 38 OFFCURVE",
+"225 82 OFFCURVE",
+"225 124 CURVE",
+"175 124 OFFCURVE",
+"147 178 OFFCURVE",
+"147 294 CURVE SMOOTH",
+"147 397 OFFCURVE",
+"159 508 OFFCURVE",
+"218 508 CURVE SMOOTH",
+"244 508 OFFCURVE",
+"257 484 OFFCURVE",
+"259 463 CURVE",
+"335 514 LINE",
+"308 581 OFFCURVE",
+"253 620 OFFCURVE",
+"193 620 CURVE SMOOTH",
+"65 620 OFFCURVE",
+"20 500 OFFCURVE",
+"20 297 CURVE SMOOTH"
+);
+},
+{
+closed = 0;
+nodes = (
+"389 605 LINE",
+"274 605 OFFCURVE",
+"230 514 OFFCURVE",
+"225 437 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"870 -11 OFFCURVE",
+"893 124 OFFCURVE",
+"893 214 CURVE SMOOTH",
+"893 344 OFFCURVE",
+"846 436 OFFCURVE",
+"664 436 CURVE SMOOTH",
+"593 436 OFFCURVE",
+"511 403 OFFCURVE",
+"457 372 CURVE",
+"385 297 LINE",
+"464 314 OFFCURVE",
+"526 338 OFFCURVE",
+"591 338 CURVE SMOOTH",
+"748 338 OFFCURVE",
+"786 284 OFFCURVE",
+"786 216 CURVE SMOOTH",
+"786 175 OFFCURVE",
+"774 137 OFFCURVE",
+"727 137 CURVE SMOOTH",
+"668 137 OFFCURVE",
+"653 178 OFFCURVE",
+"653 255 CURVE SMOOTH",
+"653 263 LINE",
+"528 263 LINE",
+"528 250 LINE SMOOTH",
+"528 182 OFFCURVE",
+"497 137 OFFCURVE",
+"453 137 CURVE SMOOTH",
+"419 137 OFFCURVE",
+"404 165 OFFCURVE",
+"404 203 CURVE SMOOTH",
+"404 235 OFFCURVE",
+"407 257 OFFCURVE",
+"408 263 CURVE",
+"334 261 LINE",
+"323 232 OFFCURVE",
+"321 179 OFFCURVE",
+"309 115 CURVE",
+"309 69 OFFCURVE",
+"343 -11 OFFCURVE",
+"458 -11 CURVE SMOOTH",
+"532 -11 OFFCURVE",
+"578 24 OFFCURVE",
+"591 101 CURVE",
+"603 24 OFFCURVE",
+"654 -11 OFFCURVE",
+"728 -11 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"974 465 OFFCURVE",
+"1018 465 OFFCURVE",
+"1048 465 CURVE",
+"1035 556 OFFCURVE",
+"947 622 OFFCURVE",
+"807 622 CURVE SMOOTH",
+"662 622 OFFCURVE",
+"596 578 OFFCURVE",
+"489 478 CURVE",
+"463 467 LINE",
+"391 407 OFFCURVE",
+"282 297 OFFCURVE",
+"195 195 CURVE",
+"272 129 LINE",
+"326 157 LINE",
+"356 195 LINE",
+"409 257 OFFCURVE",
+"453 305 OFFCURVE",
+"537 368 CURVE",
+"571 409 LINE",
+"633 448 OFFCURVE",
+"696 505 OFFCURVE",
+"805 505 CURVE SMOOTH",
+"884 505 OFFCURVE",
+"940 478 OFFCURVE",
+"947 465 CURVE"
+);
+},
+{
+closed = 1;
+nodes = (
+"274 605 OFFCURVE",
+"230 514 OFFCURVE",
+"225 437 CURVE SMOOTH",
+"225 432 OFFCURVE",
+"225 427 OFFCURVE",
+"225 422 CURVE",
+"365 422 LINE",
+"365 454 OFFCURVE",
+"383 491 OFFCURVE",
+"414 491 CURVE SMOOTH",
+"438 491 OFFCURVE",
+"450 473 OFFCURVE",
+"450 457 CURVE SMOOTH",
+"450 444 OFFCURVE",
+"447 431 OFFCURVE",
+"435 416 CURVE",
+"528 430 LINE",
+"540 455 OFFCURVE",
+"546 478 OFFCURVE",
+"546 499 CURVE SMOOTH",
+"544 565 OFFCURVE",
+"478 605 OFFCURVE",
+"389 605 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"1017 445 LINE SMOOTH",
+"909 445 OFFCURVE",
+"795 379 OFFCURVE",
+"795 224 CURVE SMOOTH",
+"795 72 OFFCURVE",
+"899 -11 OFFCURVE",
+"1096 -11 CURVE SMOOTH",
+"1220 -11 OFFCURVE",
+"1280 -5 OFFCURVE",
+"1360 24 CURVE",
+"1360 151 LINE",
+"1285 126 OFFCURVE",
+"1209 116 OFFCURVE",
+"1131 116 CURVE SMOOTH",
+"996 116 OFFCURVE",
+"936 154 OFFCURVE",
+"936 229 CURVE SMOOTH",
+"936 326 OFFCURVE",
+"1028 330 OFFCURVE",
+"1063 330 CURVE SMOOTH",
+"1349 330 LINE",
+"1349 439 LINE SMOOTH",
+"1349 514 OFFCURVE",
+"1296 622 OFFCURVE",
+"1143 622 CURVE SMOOTH",
+"1038 622 OFFCURVE",
+"945 580 OFFCURVE",
+"945 489 CURVE SMOOTH",
+"945 473 OFFCURVE",
+"945 477 OFFCURVE",
+"947 465 CURVE",
+"1048 465 LINE",
+"1056 484 OFFCURVE",
+"1077 505 OFFCURVE",
+"1128 505 CURVE SMOOTH",
+"1191 505 OFFCURVE",
+"1216 479 OFFCURVE",
+"1213 445 CURVE"
+);
+},
+{
+closed = 1;
+nodes = (
+"1293 -271 OFFCURVE",
+"1320 -262 OFFCURVE",
+"1362 -248 CURVE",
+"1362 -126 LINE",
+"1337 -135 OFFCURVE",
+"1308 -141 OFFCURVE",
+"1279 -141 CURVE SMOOTH",
+"1239 -141 OFFCURVE",
+"1212 -123 OFFCURVE",
+"1212 -90 CURVE SMOOTH",
+"1212 -48 OFFCURVE",
+"1261 -9 OFFCURVE",
+"1336 16 CURVE",
+"1309 61 LINE",
+"1251 46 LINE",
+"1106 -7 OFFCURVE",
+"1056 -56 OFFCURVE",
+"1056 -136 CURVE SMOOTH",
+"1056 -211 OFFCURVE",
+"1121 -271 OFFCURVE",
+"1243 -271 CURVE SMOOTH"
+);
+}
+);
+width = 1373;
 }
 );
 leftMetricsKey = gasinh;
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/sanyaka-sinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/sanyaka-sinh.glyph
index 43096dd4..81c06891 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/sanyaka-sinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/sanyaka-sinh.glyph
@@ -9,26 +9,26 @@ paths = (
 {
 closed = 1;
 nodes = (
-"0 141 OFFCURVE",
-"74 -5 OFFCURVE",
-"213 -5 CURVE",
-"214 133 LINE",
-"172 134 OFFCURVE",
-"140 197 OFFCURVE",
-"140 290 CURVE",
-"140 393 OFFCURVE",
-"165 510 OFFCURVE",
-"264 510 CURVE SMOOTH",
-"294 510 OFFCURVE",
-"354 484 OFFCURVE",
-"404 453 CURVE",
-"465 543 LINE",
-"435 569 OFFCURVE",
-"354 622 OFFCURVE",
-"269 622 CURVE SMOOTH",
-"92 622 OFFCURVE",
-"0 494 OFFCURVE",
-"0 291 CURVE SMOOTH"
+"41 178 OFFCURVE",
+"78 79 OFFCURVE",
+"143 0 CURVE",
+"168 13 LINE",
+"104 86 OFFCURVE",
+"68 180 OFFCURVE",
+"68 275 CURVE SMOOTH",
+"68 473 OFFCURVE",
+"204 598 OFFCURVE",
+"421 598 CURVE SMOOTH",
+"433 598 OFFCURVE",
+"463 596 OFFCURVE",
+"476 594 CURVE",
+"530 606 LINE",
+"488 616 OFFCURVE",
+"456 620 OFFCURVE",
+"420 620 CURVE SMOOTH",
+"187 620 OFFCURVE",
+"41 487 OFFCURVE",
+"41 276 CURVE SMOOTH"
 );
 }
 );
@@ -40,26 +40,26 @@ paths = (
 {
 closed = 1;
 nodes = (
-"0 141 OFFCURVE",
-"74 -5 OFFCURVE",
-"213 -5 CURVE",
-"214 63 LINE",
-"152 64 OFFCURVE",
-"71 140 OFFCURVE",
-"71 293 CURVE SMOOTH",
-"71 466 OFFCURVE",
-"145 540 OFFCURVE",
-"254 540 CURVE SMOOTH",
-"314 540 OFFCURVE",
-"344 524 OFFCURVE",
-"394 483 CURVE",
-"435 543 LINE",
-"405 569 OFFCURVE",
-"354 612 OFFCURVE",
-"259 612 CURVE SMOOTH",
-"92 612 OFFCURVE",
-"0 494 OFFCURVE",
-"0 290 CURVE SMOOTH"
+"36 158 OFFCURVE",
+"72 71 OFFCURVE",
+"119 0 CURVE",
+"185 34 LINE",
+"140 99 OFFCURVE",
+"109 180 OFFCURVE",
+"109 268 CURVE SMOOTH",
+"109 431 OFFCURVE",
+"193 553 OFFCURVE",
+"438 553 CURVE SMOOTH",
+"448 553 OFFCURVE",
+"474 552 OFFCURVE",
+"483 551 CURVE",
+"526 608 LINE",
+"491 615 OFFCURVE",
+"462 616 OFFCURVE",
+"433 616 CURVE SMOOTH",
+"168 616 OFFCURVE",
+"36 487 OFFCURVE",
+"36 263 CURVE SMOOTH"
 );
 }
 );
@@ -71,26 +71,26 @@ paths = (
 {
 closed = 1;
 nodes = (
-"0 141 OFFCURVE",
-"74 -5 OFFCURVE",
-"213 -5 CURVE",
-"214 133 LINE",
-"172 134 OFFCURVE",
-"140 197 OFFCURVE",
-"140 290 CURVE SMOOTH",
-"140 393 OFFCURVE",
-"165 510 OFFCURVE",
-"264 510 CURVE SMOOTH",
-"294 510 OFFCURVE",
-"354 484 OFFCURVE",
-"404 453 CURVE",
-"465 543 LINE",
-"435 569 OFFCURVE",
-"354 622 OFFCURVE",
-"269 622 CURVE SMOOTH",
-"92 622 OFFCURVE",
-"0 494 OFFCURVE",
-"0 291 CURVE SMOOTH"
+"10 164 OFFCURVE",
+"40 70 OFFCURVE",
+"93 0 CURVE",
+"229 38 LINE",
+"176 116 OFFCURVE",
+"150 188 OFFCURVE",
+"150 271 CURVE SMOOTH",
+"150 362 OFFCURVE",
+"191 522 OFFCURVE",
+"422 522 CURVE SMOOTH",
+"465 522 OFFCURVE",
+"497 514 OFFCURVE",
+"514 511 CURVE",
+"579 621 LINE",
+"531 631 OFFCURVE",
+"514 636 OFFCURVE",
+"448 636 CURVE SMOOTH",
+"152 636 OFFCURVE",
+"10 493 OFFCURVE",
+"10 262 CURVE SMOOTH"
 );
 }
 );
@@ -107,6 +107,45 @@ width = 600;
 {
 layerId = "DC607D84-584B-45E6-A9EB-D1AF471CA2AE";
 width = 600;
+},
+{
+anchors = (
+{
+name = virama;
+position = "{694, 536}";
+}
+);
+associatedMasterId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
+layerId = "A4B9383D-E86B-406A-AA52-AD7ED903D448";
+name = "29 Dec 24 at 16:44";
+paths = (
+{
+closed = 1;
+nodes = (
+"20 164 OFFCURVE",
+"50 70 OFFCURVE",
+"103 0 CURVE",
+"239 38 LINE",
+"186 116 OFFCURVE",
+"160 188 OFFCURVE",
+"160 261 CURVE SMOOTH",
+"160 372 OFFCURVE",
+"201 508 OFFCURVE",
+"292 508 CURVE SMOOTH",
+"335 508 OFFCURVE",
+"361 490 OFFCURVE",
+"361 462 CURVE",
+"473 463 LINE",
+"473 545 OFFCURVE",
+"444 616 OFFCURVE",
+"298 616 CURVE SMOOTH",
+"152 616 OFFCURVE",
+"20 493 OFFCURVE",
+"20 262 CURVE SMOOTH"
+);
+}
+);
+width = 465;
 }
 );
 }
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/sasinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/sasinh.glyph
index f16ddc57..de3b32c0 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/sasinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/sasinh.glyph
@@ -14,7 +14,7 @@ position = "{252, 583}";
 },
 {
 name = uvowel;
-position = "{782, 176}";
+position = "{789, 176}";
 },
 {
 name = virama;
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/uvowelsignsinh.medium.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/uvowelsignsinh.medium.glyph
index 49deacb4..3efd4ff7 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/uvowelsignsinh.medium.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/uvowelsignsinh.medium.glyph
@@ -49,24 +49,24 @@ paths = (
 {
 closed = 1;
 nodes = (
-"-635 -212 OFFCURVE",
-"-601 -261 OFFCURVE",
-"-494 -261 CURVE SMOOTH",
+"-665 -212 OFFCURVE",
+"-631 -261 OFFCURVE",
+"-524 -261 CURVE SMOOTH",
 "-27 -261 LINE",
 "-27 176 LINE",
-"-99 115 LINE",
+"-99 35 LINE",
 "-99 -193 LINE",
-"-476 -193 LINE SMOOTH",
-"-546 -193 OFFCURVE",
-"-572 -171 OFFCURVE",
-"-572 -142 CURVE SMOOTH",
-"-572 -125 OFFCURVE",
-"-566 -106 OFFCURVE",
-"-557 -87 CURVE",
-"-617 -87 LINE",
-"-630 -107 OFFCURVE",
-"-635 -135 OFFCURVE",
-"-635 -163 CURVE SMOOTH"
+"-506 -193 LINE SMOOTH",
+"-576 -193 OFFCURVE",
+"-602 -171 OFFCURVE",
+"-602 -142 CURVE SMOOTH",
+"-602 -125 OFFCURVE",
+"-596 -106 OFFCURVE",
+"-587 -87 CURVE",
+"-647 -87 LINE",
+"-660 -107 OFFCURVE",
+"-665 -135 OFFCURVE",
+"-665 -163 CURVE SMOOTH"
 );
 }
 );
diff --git a/sources/NotoSansSinhala.glyphspackage/order.plist b/sources/NotoSansSinhala.glyphspackage/order.plist
index caacf783..3a89a9c0 100644
--- a/sources/NotoSansSinhala.glyphspackage/order.plist
+++ b/sources/NotoSansSinhala.glyphspackage/order.plist
@@ -372,6 +372,7 @@ z,
 nbspace,
 viramasinh.alt2,
 _part.iVovewl,
+_part.ka,
 touchsinh,
 "sanyaka-sinh"
 )
\ No newline at end of file