diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/ddhasinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/ddhasinh.glyph
index 9253c43e..c9562d29 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/ddhasinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/ddhasinh.glyph
@@ -18,6 +18,31 @@ paths = (
 {
 closed = 1;
 nodes = (
+"549 540 OFFCURVE",
+"599 574 OFFCURVE",
+"626 645 CURVE",
+"606 661 LINE",
+"583 593 OFFCURVE",
+"537 566 OFFCURVE",
+"495 566 CURVE SMOOTH",
+"438 566 OFFCURVE",
+"422 603 OFFCURVE",
+"421 672 CURVE SMOOTH",
+"419 776 OFFCURVE",
+"416 800 OFFCURVE",
+"377 828 CURVE",
+"362 812 LINE",
+"392 790 OFFCURVE",
+"393 765 OFFCURVE",
+"395 666 CURVE SMOOTH",
+"397 565 OFFCURVE",
+"442 540 OFFCURVE",
+"495 540 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
 "307 -11 OFFCURVE",
 "356 43 OFFCURVE",
 "375 117 CURVE",
@@ -32,7 +57,7 @@ nodes = (
 "625 721 OFFCURVE",
 "374 836 CURVE",
 "362 812 LINE",
-"603 691 OFFCURVE",
+"579 714 OFFCURVE",
 "722 577 OFFCURVE",
 "722 307 CURVE SMOOTH",
 "722 87 OFFCURVE",
@@ -49,71 +74,47 @@ nodes = (
 "213 15 CURVE SMOOTH",
 "126 15 OFFCURVE",
 "60 71 OFFCURVE",
-"60 203 CURVE SMOOTH",
-"60 364 OFFCURVE",
-"187 429 OFFCURVE",
-"348 429 CURVE SMOOTH",
-"373 429 LINE",
-"373 446 LINE SMOOTH",
-"373 544 OFFCURVE",
-"319 612 OFFCURVE",
-"222 612 CURVE SMOOTH",
-"145 612 OFFCURVE",
-"95 572 OFFCURVE",
-"95 498 CURVE SMOOTH",
-"95 493 OFFCURVE",
+"60 187 CURVE SMOOTH",
+"60 328 OFFCURVE",
+"150 387 OFFCURVE",
+"272 387 CURVE SMOOTH",
+"400 387 LINE",
+"400 424 LINE SMOOTH",
+"400 495 OFFCURVE",
+"376 612 OFFCURVE",
+"238 612 CURVE SMOOTH",
+"170 612 OFFCURVE",
+"95 569 OFFCURVE",
+"95 490 CURVE SMOOTH",
 "95 485 OFFCURVE",
-"96 476 CURVE",
-"123 478 LINE",
-"122 484 OFFCURVE",
-"122 490 OFFCURVE",
-"122 495 CURVE SMOOTH",
-"122 557 OFFCURVE",
-"159 586 OFFCURVE",
-"224 586 CURVE SMOOTH",
-"297 586 OFFCURVE",
-"346 537 OFFCURVE",
-"347 444 CURVE",
-"359 455 LINE",
-"20 455 LINE",
-"20 429 LINE",
-"111 429 LINE",
-"162 429 OFFCURVE",
-"205 432 OFFCURVE",
-"251 436 CURVE",
-"245 436 LINE",
-"90 412 OFFCURVE",
+"95 484 OFFCURVE",
+"96 478 CURVE",
+"125 478 LINE",
+"124 484 OFFCURVE",
+"124 486 OFFCURVE",
+"124 488 CURVE SMOOTH",
+"124 557 OFFCURVE",
+"184 586 OFFCURVE",
+"240 586 CURVE SMOOTH",
+"354 586 OFFCURVE",
+"373 495 OFFCURVE",
+"373 411 CURVE SMOOTH",
+"373 409 OFFCURVE",
+"373 407 OFFCURVE",
+"373 405 CURVE",
+"391 413 LINE",
+"7 413 LINE",
+"7 387 LINE",
+"132 387 LINE",
+"286 394 LINE",
+"245 397 LINE",
+"96 397 OFFCURVE",
 "33 315 OFFCURVE",
-"33 203 CURVE SMOOTH",
+"33 187 CURVE SMOOTH",
 "33 65 OFFCURVE",
 "102 -11 OFFCURVE",
 "214 -11 CURVE SMOOTH"
 );
-},
-{
-closed = 1;
-nodes = (
-"562 540 OFFCURVE",
-"607 581 OFFCURVE",
-"631 641 CURVE",
-"611 657 LINE",
-"580 586 OFFCURVE",
-"541 566 OFFCURVE",
-"495 566 CURVE SMOOTH",
-"438 566 OFFCURVE",
-"422 603 OFFCURVE",
-"421 672 CURVE SMOOTH",
-"419 776 OFFCURVE",
-"416 800 OFFCURVE",
-"377 828 CURVE",
-"362 812 LINE",
-"392 790 OFFCURVE",
-"393 765 OFFCURVE",
-"395 666 CURVE SMOOTH",
-"397 565 OFFCURVE",
-"442 540 OFFCURVE",
-"495 540 CURVE SMOOTH"
-);
 }
 );
 width = 790;
@@ -134,6 +135,31 @@ paths = (
 {
 closed = 1;
 nodes = (
+"605 523 OFFCURVE",
+"644 569 OFFCURVE",
+"665 612 CURVE",
+"620 661 LINE",
+"600 613 OFFCURVE",
+"571 589 OFFCURVE",
+"534 589 CURVE SMOOTH",
+"498 589 OFFCURVE",
+"477 607 OFFCURVE",
+"477 655 CURVE SMOOTH",
+"477 747 OFFCURVE",
+"467 773 OFFCURVE",
+"433 791 CURVE",
+"383 775 LINE",
+"410 757 OFFCURVE",
+"411 742 OFFCURVE",
+"411 642 CURVE SMOOTH",
+"411 570 OFFCURVE",
+"452 523 OFFCURVE",
+"529 523 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
 "333 -11 OFFCURVE",
 "371 31 OFFCURVE",
 "418 95 CURVE",
@@ -166,70 +192,46 @@ nodes = (
 "154 60 OFFCURVE",
 "102 111 OFFCURVE",
 "102 204 CURVE SMOOTH",
-"102 354 OFFCURVE",
-"214 389 OFFCURVE",
-"368 389 CURVE SMOOTH",
-"403 389 LINE",
-"403 430 LINE SMOOTH",
-"403 549 OFFCURVE",
-"342 612 OFFCURVE",
+"102 317 OFFCURVE",
+"179 359 OFFCURVE",
+"280 359 CURVE SMOOTH",
+"403 359 LINE",
+"403 410 LINE SMOOTH",
+"403 510 OFFCURVE",
+"370 612 OFFCURVE",
 "234 612 CURVE SMOOTH",
-"144 612 OFFCURVE",
-"90 572 OFFCURVE",
-"90 496 CURVE SMOOTH",
-"90 490 OFFCURVE",
-"90 481 OFFCURVE",
-"91 474 CURVE",
-"164 478 LINE",
-"163 482 OFFCURVE",
-"163 486 OFFCURVE",
-"163 489 CURVE SMOOTH",
-"163 525 OFFCURVE",
-"189 546 OFFCURVE",
-"240 546 CURVE SMOOTH",
-"299 546 OFFCURVE",
-"339 508 OFFCURVE",
-"331 425 CURVE",
-"365 455 LINE",
-"16 455 LINE",
-"16 389 LINE",
-"36 389 LINE",
-"75 389 OFFCURVE",
-"127 389 OFFCURVE",
-"173 397 CURVE",
-"171 406 LINE",
-"66 365 OFFCURVE",
+"156 612 OFFCURVE",
+"81 567 OFFCURVE",
+"81 482 CURVE SMOOTH",
+"81 480 OFFCURVE",
+"81 479 OFFCURVE",
+"81 478 CURVE",
+"155 478 LINE",
+"155 480 OFFCURVE",
+"155 480 OFFCURVE",
+"155 482 CURVE SMOOTH",
+"155 520 OFFCURVE",
+"187 546 OFFCURVE",
+"233 546 CURVE SMOOTH",
+"324 546 OFFCURVE",
+"331 466 OFFCURVE",
+"332 434 CURVE SMOOTH",
+"332 427 OFFCURVE",
+"332 419 OFFCURVE",
+"332 412 CURVE",
+"364 425 LINE",
+"16 425 LINE",
+"16 360 LINE",
+"91 360 LINE",
+"173 367 LINE",
+"218 382 LINE",
+"69 382 OFFCURVE",
 "29 287 OFFCURVE",
 "29 204 CURVE SMOOTH",
 "29 65 OFFCURVE",
 "116 -11 OFFCURVE",
 "234 -11 CURVE SMOOTH"
 );
-},
-{
-closed = 1;
-nodes = (
-"597 523 OFFCURVE",
-"643 569 OFFCURVE",
-"661 611 CURVE",
-"620 661 LINE",
-"597 609 OFFCURVE",
-"572 589 OFFCURVE",
-"535 589 CURVE SMOOTH",
-"493 589 OFFCURVE",
-"483 614 OFFCURVE",
-"481 662 CURVE SMOOTH",
-"478 734 OFFCURVE",
-"464 767 OFFCURVE",
-"415 800 CURVE",
-"383 775 LINE",
-"406 761 OFFCURVE",
-"411 747 OFFCURVE",
-"411 664 CURVE SMOOTH",
-"411 570 OFFCURVE",
-"453 523 OFFCURVE",
-"530 523 CURVE SMOOTH"
-);
 }
 );
 width = 848;
@@ -250,6 +252,31 @@ paths = (
 {
 closed = 1;
 nodes = (
+"628 487 OFFCURVE",
+"667 519 OFFCURVE",
+"709 593 CURVE",
+"631 650 LINE",
+"611 618 OFFCURVE",
+"597 600 OFFCURVE",
+"568 600 CURVE SMOOTH",
+"535 600 OFFCURVE",
+"525 624 OFFCURVE",
+"525 656 CURVE SMOOTH",
+"525 715 OFFCURVE",
+"488 746 OFFCURVE",
+"457 762 CURVE",
+"382 722 LINE",
+"399 716 OFFCURVE",
+"410 715 OFFCURVE",
+"410 669 CURVE SMOOTH",
+"410 552 OFFCURVE",
+"465 487 OFFCURVE",
+"559 487 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
 "379 -11 OFFCURVE",
 "460 54 OFFCURVE",
 "457 155 CURVE",
@@ -293,26 +320,27 @@ nodes = (
 "145 622 OFFCURVE",
 "86 562 OFFCURVE",
 "86 490 CURVE SMOOTH",
-"86 489 OFFCURVE",
-"87 480 OFFCURVE",
+"86 488 OFFCURVE",
+"86 481 OFFCURVE",
 "87 475 CURVE",
 "227 475 LINE",
-"227 478 OFFCURVE",
-"228 482 OFFCURVE",
-"230 485 CURVE SMOOTH",
-"234 495 OFFCURVE",
-"246 504 OFFCURVE",
+"227 476 OFFCURVE",
+"227 477 OFFCURVE",
+"227 478 CURVE SMOOTH",
+"227 488 OFFCURVE",
+"239 504 OFFCURVE",
 "267 504 CURVE SMOOTH",
-"310 504 OFFCURVE",
-"333 458 OFFCURVE",
+"294 504 OFFCURVE",
+"313 486 OFFCURVE",
+"313 452 CURVE SMOOTH",
+"313 431 OFFCURVE",
+"307 406 OFFCURVE",
 "291 375 CURVE",
 "376 444 LINE",
 "16 444 LINE",
 "16 330 LINE",
 "44 330 LINE",
-"97 334 OFFCURVE",
-"147 339 OFFCURVE",
-"178 342 CURVE",
+"178 342 LINE",
 "127 358 LINE",
 "79 326 OFFCURVE",
 "41 276 OFFCURVE",
@@ -321,31 +349,6 @@ nodes = (
 "135 -11 OFFCURVE",
 "271 -11 CURVE SMOOTH"
 );
-},
-{
-closed = 1;
-nodes = (
-"628 487 OFFCURVE",
-"667 519 OFFCURVE",
-"709 593 CURVE",
-"631 650 LINE",
-"611 618 OFFCURVE",
-"600 600 OFFCURVE",
-"572 600 CURVE SMOOTH",
-"535 600 OFFCURVE",
-"525 624 OFFCURVE",
-"525 667 CURVE SMOOTH",
-"525 715 OFFCURVE",
-"520 714 OFFCURVE",
-"486 745 CURVE",
-"382 722 LINE",
-"399 716 OFFCURVE",
-"410 715 OFFCURVE",
-"410 669 CURVE SMOOTH",
-"410 552 OFFCURVE",
-"465 487 OFFCURVE",
-"559 487 CURVE SMOOTH"
-);
 }
 );
 width = 921;
@@ -831,6 +834,324 @@ nodes = (
 }
 );
 width = 733;
+},
+{
+anchors = (
+{
+name = top;
+position = "{437, 676}";
+},
+{
+name = uvowel;
+position = "{790, 176}";
+}
+);
+associatedMasterId = UUID0;
+layerId = "A57655B4-0DCD-4C94-99D4-0F02F04D171E";
+name = "29 Dec 24, 15:09";
+paths = (
+{
+closed = 1;
+nodes = (
+"333 -11 OFFCURVE",
+"371 31 OFFCURVE",
+"418 95 CURVE",
+"393 93 LINE",
+"428 38 OFFCURVE",
+"474 -11 OFFCURVE",
+"574 -11 CURVE SMOOTH",
+"711 -11 OFFCURVE",
+"812 78 OFFCURVE",
+"812 312 CURVE SMOOTH",
+"812 582 OFFCURVE",
+"671 750 OFFCURVE",
+"408 836 CURVE",
+"382 775 LINE",
+"616 687 OFFCURVE",
+"736 572 OFFCURVE",
+"736 314 CURVE SMOOTH",
+"736 119 OFFCURVE",
+"665 60 OFFCURVE",
+"571 60 CURVE SMOOTH",
+"467 60 OFFCURVE",
+"437 122 OFFCURVE",
+"437 208 CURVE SMOOTH",
+"437 214 LINE",
+"370 214 LINE",
+"370 208 LINE SMOOTH",
+"370 119 OFFCURVE",
+"336 60 OFFCURVE",
+"236 60 CURVE SMOOTH",
+"154 60 OFFCURVE",
+"102 111 OFFCURVE",
+"102 204 CURVE SMOOTH",
+"102 354 OFFCURVE",
+"214 389 OFFCURVE",
+"368 389 CURVE SMOOTH",
+"403 389 LINE",
+"403 430 LINE SMOOTH",
+"403 549 OFFCURVE",
+"342 612 OFFCURVE",
+"234 612 CURVE SMOOTH",
+"144 612 OFFCURVE",
+"90 572 OFFCURVE",
+"90 496 CURVE SMOOTH",
+"90 490 OFFCURVE",
+"90 481 OFFCURVE",
+"91 474 CURVE",
+"164 478 LINE",
+"163 482 OFFCURVE",
+"163 486 OFFCURVE",
+"163 489 CURVE SMOOTH",
+"163 525 OFFCURVE",
+"189 546 OFFCURVE",
+"240 546 CURVE SMOOTH",
+"299 546 OFFCURVE",
+"339 508 OFFCURVE",
+"331 425 CURVE",
+"365 455 LINE",
+"16 455 LINE",
+"16 389 LINE",
+"36 389 LINE",
+"75 389 OFFCURVE",
+"127 389 OFFCURVE",
+"173 397 CURVE",
+"171 406 LINE",
+"66 365 OFFCURVE",
+"29 287 OFFCURVE",
+"29 204 CURVE SMOOTH",
+"29 65 OFFCURVE",
+"116 -11 OFFCURVE",
+"234 -11 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"597 523 OFFCURVE",
+"643 569 OFFCURVE",
+"661 611 CURVE",
+"620 661 LINE",
+"597 609 OFFCURVE",
+"572 589 OFFCURVE",
+"535 589 CURVE SMOOTH",
+"493 589 OFFCURVE",
+"483 614 OFFCURVE",
+"481 662 CURVE SMOOTH",
+"478 734 OFFCURVE",
+"464 767 OFFCURVE",
+"415 800 CURVE",
+"383 775 LINE",
+"406 761 OFFCURVE",
+"411 747 OFFCURVE",
+"411 664 CURVE SMOOTH",
+"411 570 OFFCURVE",
+"453 523 OFFCURVE",
+"530 523 CURVE SMOOTH"
+);
+}
+);
+width = 848;
+},
+{
+anchors = (
+{
+name = top;
+position = "{386, 676}";
+},
+{
+name = uvowel;
+position = "{736, 176}";
+}
+);
+associatedMasterId = "7977A986-4EFB-4152-84F8-5A02CD382AAF";
+layerId = "8C2C7EB5-1AE5-48FB-BC85-85AC13CF581E";
+name = "29 Dec 24, 15:11";
+paths = (
+{
+closed = 1;
+nodes = (
+"307 -11 OFFCURVE",
+"356 43 OFFCURVE",
+"375 117 CURVE",
+"371 117 LINE",
+"387 43 OFFCURVE",
+"443 -11 OFFCURVE",
+"537 -11 CURVE SMOOTH",
+"665 -11 OFFCURVE",
+"749 70 OFFCURVE",
+"749 307 CURVE SMOOTH",
+"749 565 OFFCURVE",
+"625 721 OFFCURVE",
+"374 836 CURVE",
+"362 812 LINE",
+"603 691 OFFCURVE",
+"722 577 OFFCURVE",
+"722 307 CURVE SMOOTH",
+"722 87 OFFCURVE",
+"650 15 OFFCURVE",
+"536 15 CURVE SMOOTH",
+"418 15 OFFCURVE",
+"386 117 OFFCURVE",
+"386 171 CURVE SMOOTH",
+"386 204 LINE",
+"360 204 LINE",
+"360 170 LINE SMOOTH",
+"360 109 OFFCURVE",
+"324 15 OFFCURVE",
+"213 15 CURVE SMOOTH",
+"126 15 OFFCURVE",
+"60 71 OFFCURVE",
+"60 203 CURVE SMOOTH",
+"60 364 OFFCURVE",
+"187 429 OFFCURVE",
+"348 429 CURVE SMOOTH",
+"373 429 LINE",
+"373 446 LINE SMOOTH",
+"373 544 OFFCURVE",
+"319 612 OFFCURVE",
+"222 612 CURVE SMOOTH",
+"145 612 OFFCURVE",
+"95 572 OFFCURVE",
+"95 498 CURVE SMOOTH",
+"95 493 OFFCURVE",
+"95 485 OFFCURVE",
+"96 476 CURVE",
+"123 478 LINE",
+"122 484 OFFCURVE",
+"122 490 OFFCURVE",
+"122 495 CURVE SMOOTH",
+"122 557 OFFCURVE",
+"159 586 OFFCURVE",
+"224 586 CURVE SMOOTH",
+"297 586 OFFCURVE",
+"346 537 OFFCURVE",
+"347 444 CURVE",
+"359 455 LINE",
+"20 455 LINE",
+"20 429 LINE",
+"111 429 LINE",
+"162 429 OFFCURVE",
+"205 432 OFFCURVE",
+"251 436 CURVE",
+"245 436 LINE",
+"90 412 OFFCURVE",
+"33 315 OFFCURVE",
+"33 203 CURVE SMOOTH",
+"33 65 OFFCURVE",
+"102 -11 OFFCURVE",
+"214 -11 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"562 540 OFFCURVE",
+"607 581 OFFCURVE",
+"631 641 CURVE",
+"611 657 LINE",
+"580 586 OFFCURVE",
+"541 566 OFFCURVE",
+"495 566 CURVE SMOOTH",
+"438 566 OFFCURVE",
+"422 603 OFFCURVE",
+"421 672 CURVE SMOOTH",
+"419 776 OFFCURVE",
+"416 800 OFFCURVE",
+"377 828 CURVE",
+"362 812 LINE",
+"392 790 OFFCURVE",
+"393 765 OFFCURVE",
+"395 666 CURVE SMOOTH",
+"397 565 OFFCURVE",
+"442 540 OFFCURVE",
+"495 540 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"-561 -11 OFFCURVE",
+"-512 43 OFFCURVE",
+"-493 117 CURVE",
+"-497 117 LINE",
+"-481 43 OFFCURVE",
+"-425 -11 OFFCURVE",
+"-335 -11 CURVE SMOOTH",
+"-208 -11 OFFCURVE",
+"-121 80 OFFCURVE",
+"-121 348 CURVE SMOOTH",
+"-121 701 OFFCURVE",
+"-281 836 OFFCURVE",
+"-518 836 CURVE SMOOTH",
+"-625 836 OFFCURVE",
+"-690 810 OFFCURVE",
+"-784 769 CURVE",
+"-773 745 LINE",
+"-690 784 OFFCURVE",
+"-613 810 OFFCURVE",
+"-520 810 CURVE SMOOTH",
+"-272 810 OFFCURVE",
+"-148 655 OFFCURVE",
+"-148 347 CURVE SMOOTH",
+"-148 99 OFFCURVE",
+"-220 15 OFFCURVE",
+"-336 15 CURVE SMOOTH",
+"-450 15 OFFCURVE",
+"-482 117 OFFCURVE",
+"-482 171 CURVE SMOOTH",
+"-482 204 LINE",
+"-508 204 LINE",
+"-508 170 LINE SMOOTH",
+"-508 109 OFFCURVE",
+"-544 15 OFFCURVE",
+"-655 15 CURVE SMOOTH",
+"-742 15 OFFCURVE",
+"-808 71 OFFCURVE",
+"-808 187 CURVE SMOOTH",
+"-808 328 OFFCURVE",
+"-718 387 OFFCURVE",
+"-596 387 CURVE SMOOTH",
+"-468 387 LINE",
+"-468 424 LINE SMOOTH",
+"-468 495 OFFCURVE",
+"-492 612 OFFCURVE",
+"-630 612 CURVE SMOOTH",
+"-698 612 OFFCURVE",
+"-773 569 OFFCURVE",
+"-773 490 CURVE SMOOTH",
+"-773 485 OFFCURVE",
+"-773 484 OFFCURVE",
+"-772 478 CURVE",
+"-743 478 LINE",
+"-744 484 OFFCURVE",
+"-744 486 OFFCURVE",
+"-744 488 CURVE SMOOTH",
+"-744 557 OFFCURVE",
+"-684 586 OFFCURVE",
+"-628 586 CURVE SMOOTH",
+"-514 586 OFFCURVE",
+"-495 495 OFFCURVE",
+"-495 411 CURVE SMOOTH",
+"-495 409 OFFCURVE",
+"-495 407 OFFCURVE",
+"-495 405 CURVE",
+"-477 413 LINE",
+"-861 413 LINE",
+"-861 387 LINE",
+"-736 387 LINE",
+"-582 394 LINE",
+"-623 397 LINE",
+"-772 397 OFFCURVE",
+"-835 315 OFFCURVE",
+"-835 187 CURVE SMOOTH",
+"-835 65 OFFCURVE",
+"-766 -11 OFFCURVE",
+"-654 -11 CURVE SMOOTH"
+);
+}
+);
+width = 790;
 }
 );
 leftMetricsKey = sasinh;