From 89c01239021a3e559d6d88980f89ecc43622ec71 Mon Sep 17 00:00:00 2001
From: Pathum Egodawatta <pathum@mooniak.com>
Date: Mon, 30 Dec 2024 01:37:54 +0530
Subject: [PATCH] Compatibility, spacing and adjustments

---
 .../fontinfo.plist                            |   6 +-
 .../glyphs/basinh.glyph                       |   2 +-
 .../glyphs/biivowelsinh.glyph                 | 188 ++---
 .../glyphs/bivowelsinh.glyph                  | 294 ++++---
 .../glyphs/ciivowelsinh.glyph                 | 308 ++++---
 .../glyphs/ddiivowelsinh.glyph                | 417 +++++----
 .../glyphs/ddivowelsinh.glyph                 | 530 ++++++------
 .../glyphs/dhiivowelsinh.glyph                | 110 +--
 .../glyphs/jnyasinh.glyph                     | 791 ++++++++++--------
 .../glyphs/khiivowelsinh.glyph                | 318 ++++---
 .../glyphs/mbahalantsinh.glyph                |   7 +-
 .../glyphs/mbiivowelsinh.glyph                | 197 ++---
 .../glyphs/mbivowelsinh.glyph                 | 173 ++--
 .../glyphs/miivowelsinh.glyph                 | 116 ++-
 .../glyphs/mivowelsinh.glyph                  | 444 +++++-----
 .../glyphs/nathasinh.glyph                    |  30 +
 .../glyphs/nnddiivowelsinh.glyph              | 665 +++++----------
 .../glyphs/nnddivowelsinh.glyph               | 456 ++--------
 .../glyphs/nngasinh.glyph                     |  27 +-
 .../glyphs/nyacasinh.glyph                    |  30 +
 .../glyphs/nyjasinh.glyph                     | 232 +++--
 .../glyphs/tathasinh.glyph                    |  30 +
 .../glyphs/ttatthasinh.glyph                  |  30 +
 .../glyphs/ttivowelsinh.glyph                 | 188 +++--
 .../glyphs/viivowelsinh.glyph                 | 371 ++++----
 .../glyphs/vivowelsinh.glyph                  | 327 ++++----
 26 files changed, 2837 insertions(+), 3450 deletions(-)

diff --git a/sources/NotoSansSinhala.glyphspackage/fontinfo.plist b/sources/NotoSansSinhala.glyphspackage/fontinfo.plist
index 513c8f6c..d835df78 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 hasinh\012";
+code = "kasinh gasinh nngasinh tasinh shasinh hasinh bhasinh\012";
 name = blwsMarkAttachementSet2;
 },
 {
@@ -938,10 +938,6 @@ capHeight = 612;
 descender = -293;
 guideLines = (
 {
-angle = -1.8744;
-position = "{-6, 475}";
-},
-{
 position = "{-6, 444}";
 },
 {
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/basinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/basinh.glyph
index ca75374d..1becb937 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/basinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/basinh.glyph
@@ -176,7 +176,7 @@ nodes = (
 );
 }
 );
-width = 867;
+width = 865;
 },
 {
 anchors = (
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/biivowelsinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/biivowelsinh.glyph
index 315c1a3b..3c49874f 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/biivowelsinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/biivowelsinh.glyph
@@ -11,68 +11,57 @@ nodes = (
 "672 -11 OFFCURVE",
 "774 147 OFFCURVE",
 "774 341 CURVE SMOOTH",
-"774 496 OFFCURVE",
-"730 598 OFFCURVE",
-"650 656 CURVE SMOOTH",
-"629 671 OFFCURVE",
-"609 683 OFFCURVE",
-"585 693 CURVE",
-"516 725 OFFCURVE",
-"439 735 OFFCURVE",
+"774 642 OFFCURVE",
+"617 735 OFFCURVE",
 "312 735 CURVE SMOOTH",
-"265 735 LINE SMOOTH",
-"199 735 OFFCURVE",
-"168 741 OFFCURVE",
-"149 757 CURVE SMOOTH",
-"133 771 OFFCURVE",
-"127 789 OFFCURVE",
+"296 735 OFFCURVE",
+"281 735 OFFCURVE",
+"265 735 CURVE SMOOTH",
+"192 735 OFFCURVE",
+"127 739 OFFCURVE",
 "127 812 CURVE SMOOTH",
 "127 900 OFFCURVE",
 "233 931 OFFCURVE",
 "395 931 CURVE SMOOTH",
-"493 931 OFFCURVE",
-"571 921 OFFCURVE",
-"626 894 CURVE",
-"674 872 OFFCURVE",
+"513 931 OFFCURVE",
+"571 911 OFFCURVE",
+"626 884 CURVE",
+"674 862 OFFCURVE",
 "704 835 OFFCURVE",
-"704 780 CURVE SMOOTH",
-"704 732 OFFCURVE",
-"679 708 OFFCURVE",
-"633 708 CURVE SMOOTH",
-"592 708 OFFCURVE",
-"558 728 OFFCURVE",
-"558 778 CURVE SMOOTH",
-"558 833 OFFCURVE",
-"595 866 OFFCURVE",
-"646 891 CURVE",
-"624 905 LINE",
-"567 874 OFFCURVE",
-"531 836 OFFCURVE",
-"531 778 CURVE SMOOTH",
-"531 715 OFFCURVE",
-"579 682 OFFCURVE",
-"634 682 CURVE SMOOTH",
-"696 682 OFFCURVE",
-"731 717 OFFCURVE",
-"731 780 CURVE SMOOTH",
-"731 882 OFFCURVE",
+"704 770 CURVE SMOOTH",
+"704 722 OFFCURVE",
+"679 698 OFFCURVE",
+"633 698 CURVE SMOOTH",
+"592 698 OFFCURVE",
+"558 718 OFFCURVE",
+"558 768 CURVE SMOOTH",
+"558 823 OFFCURVE",
+"595 856 OFFCURVE",
+"646 881 CURVE",
+"624 895 LINE",
+"567 864 OFFCURVE",
+"531 826 OFFCURVE",
+"531 768 CURVE SMOOTH",
+"531 705 OFFCURVE",
+"579 672 OFFCURVE",
+"634 672 CURVE SMOOTH",
+"696 672 OFFCURVE",
+"731 707 OFFCURVE",
+"731 770 CURVE SMOOTH",
+"731 872 OFFCURVE",
 "637 957 OFFCURVE",
 "395 957 CURVE SMOOTH",
 "178 957 OFFCURVE",
 "100 898 OFFCURVE",
 "100 811 CURVE SMOOTH",
-"100 784 OFFCURVE",
-"107 764 OFFCURVE",
-"120 749 CURVE SMOOTH",
-"146 718 OFFCURVE",
-"188 709 OFFCURVE",
+"100 728 OFFCURVE",
+"167 709 OFFCURVE",
 "260 709 CURVE SMOOTH",
-"313 709 LINE SMOOTH",
-"465 709 OFFCURVE",
-"557 691 OFFCURVE",
-"633 634 CURVE SMOOTH",
-"706 579 OFFCURVE",
-"747 485 OFFCURVE",
+"278 709 OFFCURVE",
+"295 709 OFFCURVE",
+"313 709 CURVE SMOOTH",
+"599 709 OFFCURVE",
+"747 624 OFFCURVE",
 "747 340 CURVE SMOOTH",
 "747 157 OFFCURVE",
 "653 15 OFFCURVE",
@@ -80,11 +69,8 @@ nodes = (
 "482 15 OFFCURVE",
 "452 40 OFFCURVE",
 "452 100 CURVE SMOOTH",
-"452 142 OFFCURVE",
-"468 182 OFFCURVE",
-"484 222 CURVE SMOOTH",
-"501 266 OFFCURVE",
-"519 311 OFFCURVE",
+"452 185 OFFCURVE",
+"519 264 OFFCURVE",
 "519 363 CURVE SMOOTH",
 "519 451 OFFCURVE",
 "475 547 OFFCURVE",
@@ -126,11 +112,8 @@ nodes = (
 "419 521 OFFCURVE",
 "492 476 OFFCURVE",
 "492 363 CURVE SMOOTH",
-"492 320 OFFCURVE",
-"480 283 OFFCURVE",
-"460 232 CURVE SMOOTH",
-"438 176 OFFCURVE",
-"425 139 OFFCURVE",
+"492 266 OFFCURVE",
+"425 188 OFFCURVE",
 "425 100 CURVE SMOOTH",
 "425 67 OFFCURVE",
 "437 -11 OFFCURVE",
@@ -149,21 +132,14 @@ nodes = (
 "728 -11 OFFCURVE",
 "829 141 OFFCURVE",
 "829 342 CURVE SMOOTH",
-"829 473 OFFCURVE",
-"796 559 OFFCURVE",
-"738 626 CURVE SMOOTH",
-"706 663 OFFCURVE",
-"666 685 OFFCURVE",
-"619 705 CURVE",
-"548 734 OFFCURVE",
-"486 747 OFFCURVE",
+"829 620 OFFCURVE",
+"664 747 OFFCURVE",
 "394 747 CURVE SMOOTH",
-"283 747 LINE SMOOTH",
-"230 747 OFFCURVE",
-"204 751 OFFCURVE",
-"189 764 CURVE SMOOTH",
-"180 771 OFFCURVE",
-"174 783 OFFCURVE",
+"357 747 OFFCURVE",
+"320 747 OFFCURVE",
+"283 747 CURVE SMOOTH",
+"232 747 OFFCURVE",
+"174 748 OFFCURVE",
 "174 799 CURVE SMOOTH",
 "174 858 OFFCURVE",
 "247 887 OFFCURVE",
@@ -199,18 +175,14 @@ nodes = (
 "185 957 OFFCURVE",
 "102 891 OFFCURVE",
 "102 798 CURVE SMOOTH",
-"102 759 OFFCURVE",
-"115 732 OFFCURVE",
-"137 713 CURVE SMOOTH",
-"166 688 OFFCURVE",
-"203 677 OFFCURVE",
+"102 696 OFFCURVE",
+"185 677 OFFCURVE",
 "291 677 CURVE SMOOTH",
-"358 677 LINE SMOOTH",
-"530 677 OFFCURVE",
-"613 651 OFFCURVE",
-"671 589 CURVE SMOOTH",
-"725 531 OFFCURVE",
-"754 455 OFFCURVE",
+"313 677 OFFCURVE",
+"336 677 OFFCURVE",
+"358 677 CURVE SMOOTH",
+"625 677 OFFCURVE",
+"754 590 OFFCURVE",
 "754 339 CURVE SMOOTH",
 "754 162 OFFCURVE",
 "664 58 OFFCURVE",
@@ -218,11 +190,8 @@ nodes = (
 "527 58 OFFCURVE",
 "502 79 OFFCURVE",
 "502 122 CURVE SMOOTH",
-"502 150 OFFCURVE",
-"512 175 OFFCURVE",
-"528 213 CURVE SMOOTH",
-"549 263 OFFCURVE",
-"565 304 OFFCURVE",
+"502 188 OFFCURVE",
+"565 255 OFFCURVE",
 "565 359 CURVE SMOOTH",
 "565 469 OFFCURVE",
 "487 555 OFFCURVE",
@@ -264,11 +233,8 @@ nodes = (
 "432 486 OFFCURVE",
 "491 436 OFFCURVE",
 "491 349 CURVE SMOOTH",
-"491 305 OFFCURVE",
-"478 271 OFFCURVE",
-"462 234 CURVE SMOOTH",
-"443 190 OFFCURVE",
-"431 159 OFFCURVE",
+"491 256 OFFCURVE",
+"431 206 OFFCURVE",
 "431 117 CURVE SMOOTH",
 "431 52 OFFCURVE",
 "469 -11 OFFCURVE",
@@ -284,6 +250,21 @@ paths = (
 {
 closed = 1;
 nodes = (
+"812 -11 OFFCURVE",
+"908 106 OFFCURVE",
+"908 331 CURVE SMOOTH",
+"908 595 OFFCURVE",
+"747 775 OFFCURVE",
+"441 775 CURVE SMOOTH",
+"368 775 OFFCURVE",
+"332 769 OFFCURVE",
+"283 766 CURVE SMOOTH",
+"257 764 OFFCURVE",
+"240 774 OFFCURVE",
+"240 793 CURVE SMOOTH",
+"240 834 OFFCURVE",
+"282 852 OFFCURVE",
+"454 852 CURVE SMOOTH",
 "518 852 OFFCURVE",
 "577 843 OFFCURVE",
 "615 831 CURVE",
@@ -378,22 +359,7 @@ nodes = (
 "431 141 CURVE SMOOTH",
 "431 38 OFFCURVE",
 "521 -11 OFFCURVE",
-"629 -11 CURVE SMOOTH",
-"812 -11 OFFCURVE",
-"908 106 OFFCURVE",
-"908 331 CURVE SMOOTH",
-"908 595 OFFCURVE",
-"747 775 OFFCURVE",
-"441 775 CURVE SMOOTH",
-"368 775 OFFCURVE",
-"332 769 OFFCURVE",
-"283 766 CURVE SMOOTH",
-"257 764 OFFCURVE",
-"240 774 OFFCURVE",
-"240 793 CURVE SMOOTH",
-"240 834 OFFCURVE",
-"282 852 OFFCURVE",
-"454 852 CURVE SMOOTH"
+"629 -11 CURVE SMOOTH"
 );
 }
 );
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/bivowelsinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/bivowelsinh.glyph
index 6d4d449d..bce1408d 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/bivowelsinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/bivowelsinh.glyph
@@ -8,111 +8,105 @@ paths = (
 {
 closed = 1;
 nodes = (
-"670 -11 OFFCURVE",
-"772 147 OFFCURVE",
-"772 341 CURVE SMOOTH",
-"772 644 OFFCURVE",
-"622 735 OFFCURVE",
-"310 735 CURVE SMOOTH",
-"294 735 OFFCURVE",
-"279 735 OFFCURVE",
-"263 735 CURVE SMOOTH",
-"190 735 OFFCURVE",
-"125 739 OFFCURVE",
-"125 812 CURVE SMOOTH",
-"125 900 OFFCURVE",
-"231 931 OFFCURVE",
-"393 931 CURVE SMOOTH",
-"614 931 OFFCURVE",
-"695 871 OFFCURVE",
-"695 777 CURVE SMOOTH",
-"695 727 OFFCURVE",
-"669 679 OFFCURVE",
-"622 651 CURVE",
-"647 640 LINE",
-"696 672 OFFCURVE",
-"722 725 OFFCURVE",
-"722 776 CURVE SMOOTH",
-"722 863 OFFCURVE",
-"666 957 OFFCURVE",
-"393 957 CURVE SMOOTH",
-"176 957 OFFCURVE",
-"98 898 OFFCURVE",
-"98 811 CURVE SMOOTH",
-"98 728 OFFCURVE",
-"165 709 OFFCURVE",
-"258 709 CURVE SMOOTH",
-"276 709 OFFCURVE",
-"293 709 OFFCURVE",
-"311 709 CURVE SMOOTH",
-"597 709 OFFCURVE",
-"745 624 OFFCURVE",
-"745 340 CURVE SMOOTH",
-"745 157 OFFCURVE",
-"651 15 OFFCURVE",
-"537 15 CURVE SMOOTH",
-"480 15 OFFCURVE",
-"450 40 OFFCURVE",
-"450 100 CURVE SMOOTH",
-"450 142 OFFCURVE",
-"466 182 OFFCURVE",
-"482 222 CURVE SMOOTH",
-"499 266 OFFCURVE",
-"517 311 OFFCURVE",
-"517 363 CURVE SMOOTH",
-"517 451 OFFCURVE",
-"473 547 OFFCURVE",
-"315 547 CURVE SMOOTH",
-"171 547 OFFCURVE",
-"41 442 OFFCURVE",
-"41 242 CURVE SMOOTH",
-"41 122 OFFCURVE",
-"93 -11 OFFCURVE",
-"229 -11 CURVE SMOOTH",
-"316 -11 OFFCURVE",
-"358 38 OFFCURVE",
-"358 99 CURVE SMOOTH",
-"358 162 OFFCURVE",
-"318 206 OFFCURVE",
-"247 206 CURVE SMOOTH",
-"174 206 OFFCURVE",
-"125 158 OFFCURVE",
-"82 109 CURVE",
-"95 83 LINE",
-"138 137 OFFCURVE",
-"184 180 OFFCURVE",
-"245 180 CURVE SMOOTH",
-"307 180 OFFCURVE",
-"331 144 OFFCURVE",
-"331 99 CURVE SMOOTH",
-"331 58 OFFCURVE",
-"308 15 OFFCURVE",
-"230 15 CURVE SMOOTH",
-"160 15 OFFCURVE",
-"119 54 OFFCURVE",
-"95 105 CURVE SMOOTH",
-"75 148 OFFCURVE",
-"68 200 OFFCURVE",
-"68 243 CURVE SMOOTH",
-"68 424 OFFCURVE",
-"184 521 OFFCURVE",
-"313 521 CURVE SMOOTH",
-"417 521 OFFCURVE",
-"490 476 OFFCURVE",
-"490 363 CURVE SMOOTH",
-"490 320 OFFCURVE",
-"478 283 OFFCURVE",
-"458 232 CURVE SMOOTH",
-"436 176 OFFCURVE",
-"423 139 OFFCURVE",
-"423 100 CURVE SMOOTH",
-"423 67 OFFCURVE",
-"435 -11 OFFCURVE",
-"536 -11 CURVE SMOOTH"
+"672 -11 OFFCURVE",
+"774 147 OFFCURVE",
+"774 341 CURVE SMOOTH",
+"774 644 OFFCURVE",
+"624 735 OFFCURVE",
+"312 735 CURVE SMOOTH",
+"296 735 OFFCURVE",
+"281 735 OFFCURVE",
+"265 735 CURVE SMOOTH",
+"192 735 OFFCURVE",
+"127 739 OFFCURVE",
+"127 812 CURVE SMOOTH",
+"127 900 OFFCURVE",
+"233 931 OFFCURVE",
+"395 931 CURVE SMOOTH",
+"616 931 OFFCURVE",
+"697 871 OFFCURVE",
+"697 777 CURVE SMOOTH",
+"697 727 OFFCURVE",
+"671 679 OFFCURVE",
+"624 651 CURVE",
+"649 640 LINE",
+"698 672 OFFCURVE",
+"724 725 OFFCURVE",
+"724 776 CURVE SMOOTH",
+"724 863 OFFCURVE",
+"668 957 OFFCURVE",
+"395 957 CURVE SMOOTH",
+"178 957 OFFCURVE",
+"100 898 OFFCURVE",
+"100 811 CURVE SMOOTH",
+"100 728 OFFCURVE",
+"167 709 OFFCURVE",
+"260 709 CURVE SMOOTH",
+"278 709 OFFCURVE",
+"295 709 OFFCURVE",
+"313 709 CURVE SMOOTH",
+"599 709 OFFCURVE",
+"747 624 OFFCURVE",
+"747 340 CURVE SMOOTH",
+"747 157 OFFCURVE",
+"653 15 OFFCURVE",
+"539 15 CURVE SMOOTH",
+"482 15 OFFCURVE",
+"452 40 OFFCURVE",
+"452 100 CURVE SMOOTH",
+"452 185 OFFCURVE",
+"519 264 OFFCURVE",
+"519 363 CURVE SMOOTH",
+"519 451 OFFCURVE",
+"475 547 OFFCURVE",
+"317 547 CURVE SMOOTH",
+"173 547 OFFCURVE",
+"43 442 OFFCURVE",
+"43 242 CURVE SMOOTH",
+"43 122 OFFCURVE",
+"95 -11 OFFCURVE",
+"231 -11 CURVE SMOOTH",
+"318 -11 OFFCURVE",
+"360 38 OFFCURVE",
+"360 99 CURVE SMOOTH",
+"360 162 OFFCURVE",
+"320 206 OFFCURVE",
+"249 206 CURVE SMOOTH",
+"176 206 OFFCURVE",
+"127 158 OFFCURVE",
+"84 109 CURVE",
+"97 83 LINE",
+"140 137 OFFCURVE",
+"186 180 OFFCURVE",
+"247 180 CURVE SMOOTH",
+"309 180 OFFCURVE",
+"333 144 OFFCURVE",
+"333 99 CURVE SMOOTH",
+"333 58 OFFCURVE",
+"310 15 OFFCURVE",
+"232 15 CURVE SMOOTH",
+"162 15 OFFCURVE",
+"121 54 OFFCURVE",
+"97 105 CURVE SMOOTH",
+"77 148 OFFCURVE",
+"70 200 OFFCURVE",
+"70 243 CURVE SMOOTH",
+"70 424 OFFCURVE",
+"186 521 OFFCURVE",
+"315 521 CURVE SMOOTH",
+"419 521 OFFCURVE",
+"492 476 OFFCURVE",
+"492 363 CURVE SMOOTH",
+"492 266 OFFCURVE",
+"425 188 OFFCURVE",
+"425 100 CURVE SMOOTH",
+"425 67 OFFCURVE",
+"437 -11 OFFCURVE",
+"538 -11 CURVE SMOOTH"
 );
 }
 );
-width = 813;
+width = 815;
 },
 {
 layerId = UUID0;
@@ -166,11 +160,8 @@ nodes = (
 "527 58 OFFCURVE",
 "502 79 OFFCURVE",
 "502 122 CURVE SMOOTH",
-"502 150 OFFCURVE",
-"512 175 OFFCURVE",
-"528 213 CURVE SMOOTH",
-"549 263 OFFCURVE",
-"565 304 OFFCURVE",
+"502 188 OFFCURVE",
+"565 255 OFFCURVE",
 "565 359 CURVE SMOOTH",
 "565 469 OFFCURVE",
 "487 555 OFFCURVE",
@@ -212,11 +203,8 @@ nodes = (
 "432 486 OFFCURVE",
 "491 436 OFFCURVE",
 "491 349 CURVE SMOOTH",
-"491 305 OFFCURVE",
-"478 271 OFFCURVE",
-"462 234 CURVE SMOOTH",
-"443 190 OFFCURVE",
-"431 159 OFFCURVE",
+"491 256 OFFCURVE",
+"431 206 OFFCURVE",
 "431 117 CURVE SMOOTH",
 "431 52 OFFCURVE",
 "469 -11 OFFCURVE",
@@ -232,6 +220,46 @@ paths = (
 {
 closed = 1;
 nodes = (
+"812 -11 OFFCURVE",
+"908 106 OFFCURVE",
+"908 331 CURVE SMOOTH",
+"908 595 OFFCURVE",
+"747 775 OFFCURVE",
+"441 775 CURVE SMOOTH",
+"368 775 OFFCURVE",
+"332 769 OFFCURVE",
+"283 766 CURVE SMOOTH",
+"257 764 OFFCURVE",
+"240 774 OFFCURVE",
+"240 793 CURVE SMOOTH",
+"240 834 OFFCURVE",
+"282 848 OFFCURVE",
+"454 848 CURVE SMOOTH",
+"669 848 OFFCURVE",
+"693 824 OFFCURVE",
+"693 778 CURVE SMOOTH",
+"693 759 OFFCURVE",
+"682 738 OFFCURVE",
+"638 719 CURVE",
+"735 663 LINE",
+"821 706 OFFCURVE",
+"834 753 OFFCURVE",
+"834 798 CURVE SMOOTH",
+"834 868 OFFCURVE",
+"786 979 OFFCURVE",
+"453 979 CURVE SMOOTH",
+"197 979 OFFCURVE",
+"97 917 OFFCURVE",
+"97 792 CURVE SMOOTH",
+"97 696 OFFCURVE",
+"150 643 OFFCURVE",
+"241 643 CURVE SMOOTH",
+"283 643 OFFCURVE",
+"324 653 OFFCURVE",
+"423 653 CURVE SMOOTH",
+"599 653 OFFCURVE",
+"747 543 OFFCURVE",
+"747 344 CURVE SMOOTH",
 "747 210 OFFCURVE",
 "703 135 OFFCURVE",
 "640 135 CURVE SMOOTH",
@@ -286,47 +314,7 @@ nodes = (
 "431 141 CURVE SMOOTH",
 "431 38 OFFCURVE",
 "521 -11 OFFCURVE",
-"629 -11 CURVE SMOOTH",
-"812 -11 OFFCURVE",
-"908 106 OFFCURVE",
-"908 331 CURVE SMOOTH",
-"908 595 OFFCURVE",
-"747 775 OFFCURVE",
-"441 775 CURVE SMOOTH",
-"368 775 OFFCURVE",
-"332 769 OFFCURVE",
-"283 766 CURVE SMOOTH",
-"257 764 OFFCURVE",
-"240 774 OFFCURVE",
-"240 793 CURVE SMOOTH",
-"240 834 OFFCURVE",
-"282 848 OFFCURVE",
-"454 848 CURVE SMOOTH",
-"669 848 OFFCURVE",
-"693 824 OFFCURVE",
-"693 778 CURVE SMOOTH",
-"693 759 OFFCURVE",
-"682 738 OFFCURVE",
-"638 719 CURVE",
-"735 663 LINE",
-"821 706 OFFCURVE",
-"834 753 OFFCURVE",
-"834 798 CURVE SMOOTH",
-"834 868 OFFCURVE",
-"786 979 OFFCURVE",
-"453 979 CURVE SMOOTH",
-"197 979 OFFCURVE",
-"97 917 OFFCURVE",
-"97 792 CURVE SMOOTH",
-"97 696 OFFCURVE",
-"150 643 OFFCURVE",
-"241 643 CURVE SMOOTH",
-"283 643 OFFCURVE",
-"324 653 OFFCURVE",
-"423 653 CURVE SMOOTH",
-"599 653 OFFCURVE",
-"747 543 OFFCURVE",
-"747 344 CURVE SMOOTH"
+"629 -11 CURVE SMOOTH"
 );
 }
 );
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/ciivowelsinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/ciivowelsinh.glyph
index 95b5ae73..26b057ae 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/ciivowelsinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/ciivowelsinh.glyph
@@ -11,21 +11,14 @@ nodes = (
 "621 -11 OFFCURVE",
 "714 185 OFFCURVE",
 "714 376 CURVE SMOOTH",
-"714 492 OFFCURVE",
-"684 578 OFFCURVE",
-"623 637 CURVE SMOOTH",
-"600 660 OFFCURVE",
-"572 679 OFFCURVE",
-"537 693 CURVE",
-"479 723 OFFCURVE",
-"408 735 OFFCURVE",
+"714 639 OFFCURVE",
+"557 735 OFFCURVE",
 "300 735 CURVE SMOOTH",
-"241 735 LINE SMOOTH",
-"178 735 OFFCURVE",
-"146 739 OFFCURVE",
-"124 758 CURVE SMOOTH",
-"110 770 OFFCURVE",
-"103 787 OFFCURVE",
+"280 735 OFFCURVE",
+"261 735 OFFCURVE",
+"241 735 CURVE SMOOTH",
+"167 735 OFFCURVE",
+"103 738 OFFCURVE",
 "103 812 CURVE SMOOTH",
 "103 900 OFFCURVE",
 "209 931 OFFCURVE",
@@ -61,18 +54,14 @@ nodes = (
 "154 957 OFFCURVE",
 "76 898 OFFCURVE",
 "76 811 CURVE SMOOTH",
-"76 784 OFFCURVE",
-"83 764 OFFCURVE",
-"96 749 CURVE SMOOTH",
-"122 718 OFFCURVE",
-"164 709 OFFCURVE",
+"76 728 OFFCURVE",
+"143 709 OFFCURVE",
 "236 709 CURVE SMOOTH",
-"295 709 LINE SMOOTH",
-"450 709 OFFCURVE",
-"538 684 OFFCURVE",
-"606 616 CURVE SMOOTH",
-"659 563 OFFCURVE",
-"687 485 OFFCURVE",
+"256 709 OFFCURVE",
+"275 709 OFFCURVE",
+"295 709 CURVE SMOOTH",
+"545 709 OFFCURVE",
+"687 624 OFFCURVE",
 "687 376 CURVE SMOOTH",
 "687 202 OFFCURVE",
 "610 15 OFFCURVE",
@@ -80,11 +69,8 @@ nodes = (
 "149 15 OFFCURVE",
 "66 101 OFFCURVE",
 "66 231 CURVE SMOOTH",
-"66 291 OFFCURVE",
-"87 335 OFFCURVE",
-"119 365 CURVE SMOOTH",
-"171 414 OFFCURVE",
-"244 429 OFFCURVE",
+"66 380 OFFCURVE",
+"185 429 OFFCURVE",
 "346 429 CURVE SMOOTH",
 "439 429 LINE",
 "439 447 LINE SMOOTH",
@@ -97,22 +83,22 @@ nodes = (
 "161 493 OFFCURVE",
 "161 485 OFFCURVE",
 "162 476 CURVE",
-"189 478 LINE",
-"188 484 OFFCURVE",
+"189 476 LINE",
+"188 482 OFFCURVE",
 "188 490 OFFCURVE",
 "188 495 CURVE SMOOTH",
 "188 557 OFFCURVE",
 "225 586 OFFCURVE",
 "290 586 CURVE SMOOTH",
-"353 586 OFFCURVE",
-"408 548 OFFCURVE",
-"413 455 CURVE",
+"354 586 OFFCURVE",
+"410 547 OFFCURVE",
+"410 451 CURVE",
+"410 444 LINE",
+"425 455 LINE",
 "20 455 LINE",
 "20 429 LINE",
-"109 429 LINE SMOOTH",
-"159 429 OFFCURVE",
-"207 433 OFFCURVE",
-"253 437 CURVE",
+"109 429 LINE",
+"253 437 LINE",
 "267 439 LINE",
 "133 433 OFFCURVE",
 "39 369 OFFCURVE",
@@ -131,122 +117,108 @@ paths = (
 {
 closed = 1;
 nodes = (
-"656 -11 OFFCURVE",
-"765 170 OFFCURVE",
-"765 375 CURVE SMOOTH",
-"765 486 OFFCURVE",
-"730 581 OFFCURVE",
-"670 638 CURVE SMOOTH",
-"641 667 OFFCURVE",
-"609 686 OFFCURVE",
-"569 703 CURVE",
-"503 734 OFFCURVE",
-"430 747 OFFCURVE",
-"325 747 CURVE SMOOTH",
-"251 747 LINE SMOOTH",
-"198 747 OFFCURVE",
-"171 750 OFFCURVE",
-"156 764 CURVE SMOOTH",
-"148 771 OFFCURVE",
-"142 783 OFFCURVE",
-"142 799 CURVE SMOOTH",
-"142 858 OFFCURVE",
-"215 887 OFFCURVE",
-"378 887 CURVE SMOOTH",
-"441 887 OFFCURVE",
-"494 881 OFFCURVE",
-"531 874 CURVE SMOOTH",
-"618 855 OFFCURVE",
-"655 817 OFFCURVE",
-"655 771 CURVE SMOOTH",
-"655 738 OFFCURVE",
-"638 720 OFFCURVE",
-"603 720 CURVE SMOOTH",
-"566 720 OFFCURVE",
-"544 741 OFFCURVE",
-"544 776 CURVE SMOOTH",
-"544 815 OFFCURVE",
-"568 845 OFFCURVE",
-"606 867 CURVE",
-"549 896 LINE",
-"516 871 OFFCURVE",
-"478 829 OFFCURVE",
-"478 774 CURVE SMOOTH",
-"478 706 OFFCURVE",
-"530 667 OFFCURVE",
-"605 667 CURVE SMOOTH",
-"685 667 OFFCURVE",
-"725 708 OFFCURVE",
-"725 775 CURVE SMOOTH",
-"725 873 OFFCURVE",
-"635 957 OFFCURVE",
-"377 957 CURVE SMOOTH",
-"153 957 OFFCURVE",
-"70 891 OFFCURVE",
-"70 799 CURVE SMOOTH",
-"70 759 OFFCURVE",
-"84 732 OFFCURVE",
-"106 713 CURVE SMOOTH",
-"134 688 OFFCURVE",
-"171 677 OFFCURVE",
-"259 677 CURVE SMOOTH",
-"321 677 LINE SMOOTH",
-"469 677 OFFCURVE",
-"556 658 OFFCURVE",
-"625 580 CURVE SMOOTH",
-"666 533 OFFCURVE",
-"690 465 OFFCURVE",
-"690 374 CURVE SMOOTH",
-"690 228 OFFCURVE",
-"620 60 OFFCURVE",
-"347 60 CURVE SMOOTH",
-"183 60 OFFCURVE",
-"108 131 OFFCURVE",
-"108 232 CURVE SMOOTH",
-"108 284 OFFCURVE",
-"124 320 OFFCURVE",
-"153 344 CURVE SMOOTH",
-"194 378 OFFCURVE",
-"243 389 OFFCURVE",
-"348 389 CURVE SMOOTH",
-"448 389 LINE",
-"448 430 LINE SMOOTH",
-"448 549 OFFCURVE",
-"387 612 OFFCURVE",
-"279 612 CURVE SMOOTH",
-"190 612 OFFCURVE",
-"135 572 OFFCURVE",
-"135 496 CURVE SMOOTH",
-"135 490 OFFCURVE",
-"136 481 OFFCURVE",
-"137 474 CURVE",
-"209 478 LINE",
-"208 482 OFFCURVE",
-"208 487 OFFCURVE",
-"208 491 CURVE SMOOTH",
-"208 526 OFFCURVE",
-"234 546 OFFCURVE",
-"285 546 CURVE SMOOTH",
-"336 546 OFFCURVE",
-"374 517 OFFCURVE",
-"378 455 CURVE",
-"16 455 LINE",
-"16 389 LINE",
-"41 389 LINE SMOOTH",
-"69 389 OFFCURVE",
-"125 390 OFFCURVE",
-"165 398 CURVE",
-"210 420 LINE",
-"92 398 OFFCURVE",
-"35 325 OFFCURVE",
-"35 227 CURVE SMOOTH",
-"35 90 OFFCURVE",
-"139 -11 OFFCURVE",
-"347 -11 CURVE SMOOTH"
+"640 -11 OFFCURVE",
+"782 136 OFFCURVE",
+"782 398 CURVE SMOOTH",
+"782 647 OFFCURVE",
+"592 747 OFFCURVE",
+"343 747 CURVE SMOOTH",
+"318 747 OFFCURVE",
+"294 747 OFFCURVE",
+"269 747 CURVE SMOOTH",
+"215 747 OFFCURVE",
+"160 747 OFFCURVE",
+"160 799 CURVE SMOOTH",
+"160 858 OFFCURVE",
+"233 887 OFFCURVE",
+"396 887 CURVE SMOOTH",
+"459 887 OFFCURVE",
+"512 881 OFFCURVE",
+"549 874 CURVE SMOOTH",
+"636 855 OFFCURVE",
+"673 817 OFFCURVE",
+"673 771 CURVE SMOOTH",
+"673 738 OFFCURVE",
+"656 720 OFFCURVE",
+"621 720 CURVE SMOOTH",
+"584 720 OFFCURVE",
+"562 741 OFFCURVE",
+"562 776 CURVE SMOOTH",
+"562 815 OFFCURVE",
+"586 845 OFFCURVE",
+"624 867 CURVE",
+"567 896 LINE",
+"534 871 OFFCURVE",
+"496 829 OFFCURVE",
+"496 774 CURVE SMOOTH",
+"496 706 OFFCURVE",
+"548 667 OFFCURVE",
+"623 667 CURVE SMOOTH",
+"703 667 OFFCURVE",
+"743 708 OFFCURVE",
+"743 775 CURVE SMOOTH",
+"743 873 OFFCURVE",
+"653 957 OFFCURVE",
+"395 957 CURVE SMOOTH",
+"171 957 OFFCURVE",
+"88 891 OFFCURVE",
+"88 799 CURVE SMOOTH",
+"88 701 OFFCURVE",
+"164 677 OFFCURVE",
+"277 677 CURVE SMOOTH",
+"298 677 OFFCURVE",
+"318 677 OFFCURVE",
+"339 677 CURVE SMOOTH",
+"567 677 OFFCURVE",
+"707 603 OFFCURVE",
+"707 398 CURVE SMOOTH",
+"707 181 OFFCURVE",
+"592 60 OFFCURVE",
+"395 60 CURVE SMOOTH",
+"241 60 OFFCURVE",
+"128 121 OFFCURVE",
+"128 218 CURVE SMOOTH",
+"128 321 OFFCURVE",
+"212 359 OFFCURVE",
+"308 359 CURVE SMOOTH",
+"468 359 LINE",
+"468 408 LINE SMOOTH",
+"468 519 OFFCURVE",
+"416 612 OFFCURVE",
+"281 612 CURVE SMOOTH",
+"188 612 OFFCURVE",
+"115 560 OFFCURVE",
+"115 480 CURVE SMOOTH",
+"115 479 OFFCURVE",
+"115 479 OFFCURVE",
+"115 478 CURVE",
+"188 478 LINE",
+"188 479 OFFCURVE",
+"188 479 OFFCURVE",
+"188 480 CURVE SMOOTH",
+"188 513 OFFCURVE",
+"213 546 OFFCURVE",
+"281 546 CURVE SMOOTH",
+"369 546 OFFCURVE",
+"396 481 OFFCURVE",
+"396 420 CURVE SMOOTH",
+"396 401 LINE",
+"430 425 LINE",
+"16 425 LINE",
+"16 357 LINE",
+"41 357 LINE",
+"190 371 LINE",
+"230 387 LINE",
+"126 385 OFFCURVE",
+"53 319 OFFCURVE",
+"53 218 CURVE SMOOTH",
+"53 80 OFFCURVE",
+"197 -11 OFFCURVE",
+"395 -11 CURVE SMOOTH"
 );
 }
 );
-width = 801;
+width = 818;
 },
 {
 layerId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
@@ -254,6 +226,9 @@ paths = (
 {
 closed = 1;
 nodes = (
+"737 -11 OFFCURVE",
+"820 189 OFFCURVE",
+"820 389 CURVE SMOOTH",
 "820 639 OFFCURVE",
 "659 780 OFFCURVE",
 "398 780 CURVE SMOOTH",
@@ -315,7 +290,6 @@ nodes = (
 "199 306 OFFCURVE",
 "236 330 OFFCURVE",
 "313 330 CURVE SMOOTH",
-"316 330 LINE",
 "450 330 LINE",
 "450 411 LINE SMOOTH",
 "450 536 OFFCURVE",
@@ -327,31 +301,29 @@ nodes = (
 "86 489 OFFCURVE",
 "87 480 OFFCURVE",
 "87 475 CURVE",
-"128 475 OFFCURVE",
-"200 475 OFFCURVE",
-"227 475 CURVE",
-"227 487 OFFCURVE",
-"238 504 OFFCURVE",
+"227 475 LINE",
+"227 476 OFFCURVE",
+"227 478 OFFCURVE",
+"227 479 CURVE SMOOTH",
+"227 491 OFFCURVE",
+"241 504 OFFCURVE",
 "267 504 CURVE SMOOTH",
-"296 504 OFFCURVE",
-"316 483 OFFCURVE",
-"313 444 CURVE",
+"302 504 OFFCURVE",
+"315 473 OFFCURVE",
+"315 438 CURVE",
+"315 375 LINE",
+"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",
 "70 328 OFFCURVE",
 "38 308 OFFCURVE",
 "38 217 CURVE SMOOTH",
 "38 87 OFFCURVE",
 "158 -11 OFFCURVE",
-"398 -11 CURVE SMOOTH",
-"737 -11 OFFCURVE",
-"820 189 OFFCURVE",
-"820 389 CURVE SMOOTH"
+"398 -11 CURVE SMOOTH"
 );
 }
 );
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/ddiivowelsinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/ddiivowelsinh.glyph
index 67ecc45b..7a77d3e4 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/ddiivowelsinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/ddiivowelsinh.glyph
@@ -11,21 +11,14 @@ nodes = (
 "670 -11 OFFCURVE",
 "757 77 OFFCURVE",
 "757 328 CURVE SMOOTH",
-"757 476 OFFCURVE",
-"723 577 OFFCURVE",
-"654 641 CURVE SMOOTH",
-"631 663 OFFCURVE",
-"603 680 OFFCURVE",
-"573 693 CURVE",
-"511 724 OFFCURVE",
-"435 735 OFFCURVE",
+"757 619 OFFCURVE",
+"625 735 OFFCURVE",
 "332 735 CURVE SMOOTH",
-"261 735 LINE SMOOTH",
-"195 735 OFFCURVE",
-"164 741 OFFCURVE",
-"145 757 CURVE SMOOTH",
-"129 771 OFFCURVE",
-"123 789 OFFCURVE",
+"308 735 OFFCURVE",
+"285 735 OFFCURVE",
+"261 735 CURVE SMOOTH",
+"188 735 OFFCURVE",
+"123 739 OFFCURVE",
 "123 812 CURVE SMOOTH",
 "123 900 OFFCURVE",
 "229 931 OFFCURVE",
@@ -61,18 +54,14 @@ nodes = (
 "174 957 OFFCURVE",
 "96 898 OFFCURVE",
 "96 811 CURVE SMOOTH",
-"96 784 OFFCURVE",
-"103 764 OFFCURVE",
-"116 749 CURVE SMOOTH",
-"142 718 OFFCURVE",
-"184 709 OFFCURVE",
+"96 728 OFFCURVE",
+"163 709 OFFCURVE",
 "256 709 CURVE SMOOTH",
-"318 709 LINE SMOOTH",
-"479 709 OFFCURVE",
-"568 685 OFFCURVE",
-"635 622 CURVE SMOOTH",
-"699 562 OFFCURVE",
-"730 468 OFFCURVE",
+"277 709 OFFCURVE",
+"297 709 OFFCURVE",
+"318 709 CURVE SMOOTH",
+"610 709 OFFCURVE",
+"730 612 OFFCURVE",
 "730 326 CURVE SMOOTH",
 "730 95 OFFCURVE",
 "658 15 OFFCURVE",
@@ -89,11 +78,8 @@ nodes = (
 "136 15 OFFCURVE",
 "70 71 OFFCURVE",
 "70 203 CURVE SMOOTH",
-"70 266 OFFCURVE",
-"89 313 OFFCURVE",
-"121 348 CURVE SMOOTH",
-"172 404 OFFCURVE",
-"259 429 OFFCURVE",
+"70 364 OFFCURVE",
+"197 429 OFFCURVE",
 "358 429 CURVE SMOOTH",
 "383 429 LINE",
 "383 446 LINE SMOOTH",
@@ -106,8 +92,8 @@ nodes = (
 "105 493 OFFCURVE",
 "105 485 OFFCURVE",
 "106 476 CURVE",
-"133 478 LINE",
-"132 484 OFFCURVE",
+"133 476 LINE",
+"132 482 OFFCURVE",
 "132 490 OFFCURVE",
 "132 495 CURVE SMOOTH",
 "132 557 OFFCURVE",
@@ -118,10 +104,8 @@ nodes = (
 "357 455 CURVE",
 "30 455 LINE",
 "30 429 LINE",
-"121 429 LINE SMOOTH",
-"172 429 OFFCURVE",
-"215 432 OFFCURVE",
-"261 436 CURVE",
+"121 429 LINE",
+"261 436 LINE",
 "255 436 LINE",
 "100 412 OFFCURVE",
 "43 315 OFFCURVE",
@@ -146,137 +130,121 @@ paths = (
 {
 closed = 1;
 nodes = (
-"723 -11 OFFCURVE",
-"823 79 OFFCURVE",
-"823 323 CURVE SMOOTH",
-"823 458 OFFCURVE",
-"793 557 OFFCURVE",
-"735 624 CURVE SMOOTH",
-"704 659 OFFCURVE",
-"667 684 OFFCURVE",
-"622 703 CURVE SMOOTH",
-"548 735 OFFCURVE",
-"484 747 OFFCURVE",
-"390 747 CURVE SMOOTH",
-"284 747 LINE SMOOTH",
-"231 747 OFFCURVE",
-"203 751 OFFCURVE",
-"189 764 CURVE SMOOTH",
-"181 771 OFFCURVE",
-"175 783 OFFCURVE",
-"175 799 CURVE SMOOTH",
-"175 858 OFFCURVE",
-"247 887 OFFCURVE",
-"422 887 CURVE SMOOTH",
-"497 887 OFFCURVE",
-"542 881 OFFCURVE",
-"580 874 CURVE SMOOTH",
-"667 855 OFFCURVE",
-"704 817 OFFCURVE",
-"704 771 CURVE SMOOTH",
-"704 738 OFFCURVE",
-"686 720 OFFCURVE",
-"651 720 CURVE SMOOTH",
-"615 720 OFFCURVE",
-"593 741 OFFCURVE",
-"593 776 CURVE SMOOTH",
-"593 815 OFFCURVE",
-"617 845 OFFCURVE",
-"655 867 CURVE",
-"598 896 LINE",
-"565 871 OFFCURVE",
-"527 829 OFFCURVE",
-"527 774 CURVE SMOOTH",
-"527 703 OFFCURVE",
-"579 667 OFFCURVE",
-"654 667 CURVE SMOOTH",
-"734 667 OFFCURVE",
-"774 708 OFFCURVE",
-"774 775 CURVE SMOOTH",
-"774 873 OFFCURVE",
-"685 957 OFFCURVE",
-"417 957 CURVE SMOOTH",
-"186 957 OFFCURVE",
-"103 891 OFFCURVE",
-"103 798 CURVE SMOOTH",
-"103 759 OFFCURVE",
-"116 732 OFFCURVE",
-"138 713 CURVE SMOOTH",
-"166 688 OFFCURVE",
-"203 677 OFFCURVE",
-"291 677 CURVE SMOOTH",
-"379 677 LINE SMOOTH",
-"526 677 OFFCURVE",
-"610 649 OFFCURVE",
-"668 587 CURVE SMOOTH",
-"722 529 OFFCURVE",
-"748 441 OFFCURVE",
-"748 322 CURVE SMOOTH",
-"748 122 OFFCURVE",
-"675 60 OFFCURVE",
-"585 60 CURVE SMOOTH",
-"481 60 OFFCURVE",
-"451 122 OFFCURVE",
-"451 208 CURVE SMOOTH",
-"451 214 LINE",
-"384 214 LINE",
-"384 208 LINE SMOOTH",
-"384 119 OFFCURVE",
-"350 60 OFFCURVE",
-"250 60 CURVE SMOOTH",
-"168 60 OFFCURVE",
-"116 111 OFFCURVE",
-"116 204 CURVE SMOOTH",
-"116 268 OFFCURVE",
-"138 311 OFFCURVE",
-"173 340 CURVE SMOOTH",
-"232 389 OFFCURVE",
-"312 389 OFFCURVE",
-"382 389 CURVE SMOOTH",
-"417 389 LINE",
-"417 430 LINE SMOOTH",
-"417 549 OFFCURVE",
-"356 612 OFFCURVE",
-"248 612 CURVE SMOOTH",
-"158 612 OFFCURVE",
-"104 572 OFFCURVE",
-"104 496 CURVE SMOOTH",
-"104 490 OFFCURVE",
-"104 481 OFFCURVE",
-"105 474 CURVE",
-"178 478 LINE",
-"177 482 OFFCURVE",
-"177 486 OFFCURVE",
-"177 489 CURVE SMOOTH",
-"177 526 OFFCURVE",
-"203 546 OFFCURVE",
-"254 546 CURVE SMOOTH",
-"305 546 OFFCURVE",
-"342 517 OFFCURVE",
-"346 455 CURVE",
-"30 455 LINE",
-"30 389 LINE",
-"50 389 LINE SMOOTH",
-"89 389 OFFCURVE",
-"147 389 OFFCURVE",
-"187 398 CURVE",
-"185 406 LINE",
-"80 365 OFFCURVE",
-"43 287 OFFCURVE",
-"43 204 CURVE SMOOTH",
-"43 65 OFFCURVE",
-"129 -11 OFFCURVE",
-"248 -11 CURVE SMOOTH",
-"337 -11 OFFCURVE",
-"377 23 OFFCURVE",
-"418 77 CURVE",
-"453 29 OFFCURVE",
-"498 -11 OFFCURVE",
-"583 -11 CURVE SMOOTH"
+"709 -11 OFFCURVE",
+"809 79 OFFCURVE",
+"809 323 CURVE SMOOTH",
+"809 650 OFFCURVE",
+"621 747 OFFCURVE",
+"376 747 CURVE SMOOTH",
+"341 747 OFFCURVE",
+"305 747 OFFCURVE",
+"270 747 CURVE SMOOTH",
+"216 747 OFFCURVE",
+"161 747 OFFCURVE",
+"161 799 CURVE SMOOTH",
+"161 858 OFFCURVE",
+"233 887 OFFCURVE",
+"408 887 CURVE SMOOTH",
+"483 887 OFFCURVE",
+"528 881 OFFCURVE",
+"566 874 CURVE SMOOTH",
+"653 855 OFFCURVE",
+"690 817 OFFCURVE",
+"690 771 CURVE SMOOTH",
+"690 738 OFFCURVE",
+"672 720 OFFCURVE",
+"637 720 CURVE SMOOTH",
+"601 720 OFFCURVE",
+"579 741 OFFCURVE",
+"579 776 CURVE SMOOTH",
+"579 815 OFFCURVE",
+"603 845 OFFCURVE",
+"641 867 CURVE",
+"584 896 LINE",
+"551 871 OFFCURVE",
+"513 829 OFFCURVE",
+"513 774 CURVE SMOOTH",
+"513 703 OFFCURVE",
+"565 667 OFFCURVE",
+"640 667 CURVE SMOOTH",
+"720 667 OFFCURVE",
+"760 708 OFFCURVE",
+"760 775 CURVE SMOOTH",
+"760 873 OFFCURVE",
+"671 957 OFFCURVE",
+"403 957 CURVE SMOOTH",
+"172 957 OFFCURVE",
+"89 891 OFFCURVE",
+"89 798 CURVE SMOOTH",
+"89 700 OFFCURVE",
+"165 677 OFFCURVE",
+"277 677 CURVE SMOOTH",
+"306 677 OFFCURVE",
+"336 677 OFFCURVE",
+"365 677 CURVE SMOOTH",
+"623 677 OFFCURVE",
+"734 577 OFFCURVE",
+"734 322 CURVE SMOOTH",
+"734 122 OFFCURVE",
+"661 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 526 OFFCURVE",
+"189 546 OFFCURVE",
+"240 546 CURVE SMOOTH",
+"291 546 OFFCURVE",
+"328 517 OFFCURVE",
+"332 455 CURVE",
+"16 455 LINE",
+"16 389 LINE",
+"36 389 LINE",
+"173 398 LINE",
+"171 406 LINE",
+"66 365 OFFCURVE",
+"29 287 OFFCURVE",
+"29 204 CURVE SMOOTH",
+"29 65 OFFCURVE",
+"115 -11 OFFCURVE",
+"234 -11 CURVE SMOOTH",
+"323 -11 OFFCURVE",
+"363 23 OFFCURVE",
+"404 77 CURVE",
+"439 29 OFFCURVE",
+"484 -11 OFFCURVE",
+"569 -11 CURVE SMOOTH"
 );
 }
 );
-width = 864;
+width = 845;
 },
 {
 layerId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
@@ -284,66 +252,6 @@ paths = (
 {
 closed = 1;
 nodes = (
-"588 653 OFFCURVE",
-"736 562 OFFCURVE",
-"736 363 CURVE SMOOTH",
-"736 233 OFFCURVE",
-"695 137 OFFCURVE",
-"604 137 CURVE SMOOTH",
-"555 137 OFFCURVE",
-"519 172 OFFCURVE",
-"519 244 CURVE SMOOTH",
-"519 248 LINE",
-"385 248 LINE",
-"385 244 LINE SMOOTH",
-"385 176 OFFCURVE",
-"351 137 OFFCURVE",
-"295 137 CURVE SMOOTH",
-"229 137 OFFCURVE",
-"202 173 OFFCURVE",
-"202 226 CURVE SMOOTH",
-"202 306 OFFCURVE",
-"256 330 OFFCURVE",
-"330 330 CURVE SMOOTH",
-"450 330 LINE",
-"450 411 LINE SMOOTH",
-"450 536 OFFCURVE",
-"383 623 OFFCURVE",
-"253 622 CURVE SMOOTH",
-"145 621 OFFCURVE",
-"86 562 OFFCURVE",
-"86 490 CURVE SMOOTH",
-"86 489 OFFCURVE",
-"87 480 OFFCURVE",
-"87 475 CURVE",
-"128 475 OFFCURVE",
-"200 475 OFFCURVE",
-"227 475 CURVE",
-"227 487 OFFCURVE",
-"238 504 OFFCURVE",
-"267 504 CURVE SMOOTH",
-"296 504 OFFCURVE",
-"316 483 OFFCURVE",
-"313 444 CURVE",
-"16 444 LINE",
-"16 330 LINE",
-"44 330 LINE",
-"97 334 OFFCURVE",
-"147 339 OFFCURVE",
-"178 342 CURVE",
-"127 358 LINE",
-"79 326 OFFCURVE",
-"41 276 OFFCURVE",
-"41 192 CURVE SMOOTH",
-"41 69 OFFCURVE",
-"135 -11 OFFCURVE",
-"271 -11 CURVE SMOOTH",
-"363 -11 OFFCURVE",
-"430 38 OFFCURVE",
-"453 112 CURVE",
-"476 38 OFFCURVE",
-"547 -11 OFFCURVE",
-"633 -11 CURVE SMOOTH",
 "784 -11 OFFCURVE",
 "897 86 OFFCURVE",
 "897 350 CURVE SMOOTH",
@@ -395,7 +303,66 @@ nodes = (
 "230 643 CURVE SMOOTH",
 "272 643 OFFCURVE",
 "313 653 OFFCURVE",
-"412 653 CURVE SMOOTH"
+"412 653 CURVE SMOOTH",
+"588 653 OFFCURVE",
+"736 562 OFFCURVE",
+"736 363 CURVE SMOOTH",
+"736 233 OFFCURVE",
+"695 137 OFFCURVE",
+"604 137 CURVE SMOOTH",
+"555 137 OFFCURVE",
+"519 172 OFFCURVE",
+"519 244 CURVE SMOOTH",
+"519 248 LINE",
+"385 248 LINE",
+"385 244 LINE SMOOTH",
+"385 176 OFFCURVE",
+"351 137 OFFCURVE",
+"295 137 CURVE SMOOTH",
+"229 137 OFFCURVE",
+"202 173 OFFCURVE",
+"202 226 CURVE SMOOTH",
+"202 306 OFFCURVE",
+"256 330 OFFCURVE",
+"330 330 CURVE SMOOTH",
+"450 330 LINE",
+"450 411 LINE SMOOTH",
+"450 536 OFFCURVE",
+"383 623 OFFCURVE",
+"253 622 CURVE SMOOTH",
+"145 621 OFFCURVE",
+"86 562 OFFCURVE",
+"86 490 CURVE SMOOTH",
+"86 489 OFFCURVE",
+"87 480 OFFCURVE",
+"87 475 CURVE",
+"227 475 LINE",
+"227 476 OFFCURVE",
+"227 477 OFFCURVE",
+"227 477 CURVE SMOOTH",
+"227 489 OFFCURVE",
+"240 504 OFFCURVE",
+"267 504 CURVE SMOOTH",
+"296 504 OFFCURVE",
+"316 483 OFFCURVE",
+"313 444 CURVE",
+"16 444 LINE",
+"16 330 LINE",
+"44 330 LINE",
+"178 342 LINE",
+"127 358 LINE",
+"79 326 OFFCURVE",
+"41 276 OFFCURVE",
+"41 192 CURVE SMOOTH",
+"41 69 OFFCURVE",
+"135 -11 OFFCURVE",
+"271 -11 CURVE SMOOTH",
+"363 -11 OFFCURVE",
+"430 38 OFFCURVE",
+"453 112 CURVE",
+"476 38 OFFCURVE",
+"547 -11 OFFCURVE",
+"633 -11 CURVE SMOOTH"
 );
 }
 );
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/ddivowelsinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/ddivowelsinh.glyph
index f37fcddc..e93b4efb 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/ddivowelsinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/ddivowelsinh.glyph
@@ -8,119 +8,109 @@ paths = (
 {
 closed = 1;
 nodes = (
-"670 -11 OFFCURVE",
-"757 77 OFFCURVE",
-"757 328 CURVE SMOOTH",
-"757 476 OFFCURVE",
-"723 577 OFFCURVE",
-"654 641 CURVE SMOOTH",
-"582 708 OFFCURVE",
-"485 735 OFFCURVE",
-"332 735 CURVE SMOOTH",
-"261 735 LINE SMOOTH",
-"195 735 OFFCURVE",
-"164 741 OFFCURVE",
-"145 757 CURVE SMOOTH",
-"129 771 OFFCURVE",
-"123 789 OFFCURVE",
-"123 812 CURVE SMOOTH",
-"123 900 OFFCURVE",
-"229 931 OFFCURVE",
-"387 931 CURVE SMOOTH",
-"605 931 OFFCURVE",
-"686 875 OFFCURVE",
-"686 783 CURVE SMOOTH",
-"686 741 OFFCURVE",
-"671 708 OFFCURVE",
-"654 680 CURVE",
-"679 669 LINE",
-"698 701 OFFCURVE",
-"713 739 OFFCURVE",
-"713 782 CURVE SMOOTH",
-"713 867 OFFCURVE",
-"657 957 OFFCURVE",
-"387 957 CURVE SMOOTH",
-"174 957 OFFCURVE",
-"96 898 OFFCURVE",
-"96 811 CURVE SMOOTH",
-"96 784 OFFCURVE",
-"103 764 OFFCURVE",
-"116 749 CURVE SMOOTH",
-"142 718 OFFCURVE",
-"184 709 OFFCURVE",
-"256 709 CURVE SMOOTH",
-"318 709 LINE SMOOTH",
-"479 709 OFFCURVE",
-"568 685 OFFCURVE",
-"635 622 CURVE SMOOTH",
-"699 562 OFFCURVE",
-"730 468 OFFCURVE",
-"730 326 CURVE SMOOTH",
-"730 95 OFFCURVE",
-"658 15 OFFCURVE",
-"545 15 CURVE SMOOTH",
-"428 15 OFFCURVE",
-"396 117 OFFCURVE",
-"396 171 CURVE SMOOTH",
-"396 204 LINE",
-"370 204 LINE",
-"370 170 LINE SMOOTH",
-"370 109 OFFCURVE",
-"334 15 OFFCURVE",
-"223 15 CURVE SMOOTH",
-"136 15 OFFCURVE",
-"70 71 OFFCURVE",
-"70 203 CURVE SMOOTH",
-"70 266 OFFCURVE",
-"89 313 OFFCURVE",
-"121 348 CURVE SMOOTH",
-"172 404 OFFCURVE",
-"259 429 OFFCURVE",
-"358 429 CURVE SMOOTH",
-"383 429 LINE",
-"383 446 LINE SMOOTH",
-"383 544 OFFCURVE",
-"329 612 OFFCURVE",
-"232 612 CURVE SMOOTH",
-"155 612 OFFCURVE",
-"105 572 OFFCURVE",
-"105 498 CURVE SMOOTH",
-"105 493 OFFCURVE",
-"105 485 OFFCURVE",
-"106 476 CURVE",
-"133 478 LINE",
-"132 484 OFFCURVE",
-"132 490 OFFCURVE",
-"132 495 CURVE SMOOTH",
-"132 557 OFFCURVE",
-"169 586 OFFCURVE",
-"234 586 CURVE SMOOTH",
-"304 586 OFFCURVE",
-"352 541 OFFCURVE",
-"357 455 CURVE",
-"30 455 LINE",
-"30 429 LINE",
-"121 429 LINE SMOOTH",
-"172 429 OFFCURVE",
-"215 432 OFFCURVE",
-"261 436 CURVE SMOOTH",
-"255 436 LINE",
-"100 412 OFFCURVE",
-"43 315 OFFCURVE",
-"43 203 CURVE SMOOTH",
-"43 65 OFFCURVE",
-"112 -11 OFFCURVE",
-"224 -11 CURVE SMOOTH",
-"314 -11 OFFCURVE",
-"362 39 OFFCURVE",
-"383 109 CURVE",
-"401 39 OFFCURVE",
-"456 -11 OFFCURVE",
-"546 -11 CURVE SMOOTH"
+"647 -11 OFFCURVE",
+"734 77 OFFCURVE",
+"734 328 CURVE SMOOTH",
+"734 620 OFFCURVE",
+"604 735 OFFCURVE",
+"309 735 CURVE SMOOTH",
+"285 735 OFFCURVE",
+"262 735 OFFCURVE",
+"238 735 CURVE SMOOTH",
+"165 735 OFFCURVE",
+"100 739 OFFCURVE",
+"100 812 CURVE SMOOTH",
+"100 900 OFFCURVE",
+"206 931 OFFCURVE",
+"364 931 CURVE SMOOTH",
+"582 931 OFFCURVE",
+"658 875 OFFCURVE",
+"658 784 CURVE SMOOTH",
+"658 741 OFFCURVE",
+"628 688 OFFCURVE",
+"581 660 CURVE",
+"606 649 LINE",
+"655 681 OFFCURVE",
+"685 739 OFFCURVE",
+"685 783 CURVE SMOOTH",
+"685 867 OFFCURVE",
+"634 957 OFFCURVE",
+"364 957 CURVE SMOOTH",
+"151 957 OFFCURVE",
+"73 898 OFFCURVE",
+"73 811 CURVE SMOOTH",
+"73 728 OFFCURVE",
+"140 709 OFFCURVE",
+"233 709 CURVE SMOOTH",
+"254 709 OFFCURVE",
+"274 709 OFFCURVE",
+"295 709 CURVE SMOOTH",
+"587 709 OFFCURVE",
+"707 612 OFFCURVE",
+"707 326 CURVE SMOOTH",
+"707 95 OFFCURVE",
+"635 15 OFFCURVE",
+"522 15 CURVE SMOOTH",
+"405 15 OFFCURVE",
+"373 117 OFFCURVE",
+"373 171 CURVE SMOOTH",
+"373 204 LINE",
+"347 204 LINE",
+"347 170 LINE SMOOTH",
+"347 109 OFFCURVE",
+"311 15 OFFCURVE",
+"200 15 CURVE SMOOTH",
+"113 15 OFFCURVE",
+"47 71 OFFCURVE",
+"47 203 CURVE SMOOTH",
+"47 364 OFFCURVE",
+"174 429 OFFCURVE",
+"335 429 CURVE SMOOTH",
+"360 429 LINE",
+"360 446 LINE SMOOTH",
+"360 544 OFFCURVE",
+"306 612 OFFCURVE",
+"209 612 CURVE SMOOTH",
+"132 612 OFFCURVE",
+"82 572 OFFCURVE",
+"82 498 CURVE SMOOTH",
+"82 493 OFFCURVE",
+"82 485 OFFCURVE",
+"83 476 CURVE",
+"110 476 LINE",
+"109 482 OFFCURVE",
+"109 490 OFFCURVE",
+"109 495 CURVE SMOOTH",
+"109 557 OFFCURVE",
+"146 586 OFFCURVE",
+"211 586 CURVE SMOOTH",
+"281 586 OFFCURVE",
+"331 540 OFFCURVE",
+"331 454 CURVE SMOOTH",
+"331 444 LINE",
+"346 455 LINE",
+"7 455 LINE",
+"7 429 LINE",
+"98 429 LINE",
+"238 436 LINE",
+"232 438 LINE",
+"77 414 OFFCURVE",
+"20 315 OFFCURVE",
+"20 203 CURVE SMOOTH",
+"20 65 OFFCURVE",
+"89 -11 OFFCURVE",
+"201 -11 CURVE SMOOTH",
+"294 -11 OFFCURVE",
+"343 43 OFFCURVE",
+"362 117 CURVE",
+"358 117 LINE",
+"374 43 OFFCURVE",
+"430 -11 OFFCURVE",
+"523 -11 CURVE SMOOTH"
 );
 }
 );
-width = 801;
+width = 775;
 },
 {
 layerId = UUID0;
@@ -128,119 +118,109 @@ paths = (
 {
 closed = 1;
 nodes = (
-"723 -11 OFFCURVE",
-"823 79 OFFCURVE",
-"823 323 CURVE SMOOTH",
-"823 458 OFFCURVE",
-"793 557 OFFCURVE",
-"735 625 CURVE SMOOTH",
-"663 709 OFFCURVE",
-"553 747 OFFCURVE",
-"390 747 CURVE SMOOTH",
-"284 747 LINE SMOOTH",
-"231 747 OFFCURVE",
-"203 751 OFFCURVE",
-"189 764 CURVE SMOOTH",
-"181 771 OFFCURVE",
-"175 783 OFFCURVE",
-"175 799 CURVE SMOOTH",
-"175 858 OFFCURVE",
-"247 887 OFFCURVE",
-"422 887 CURVE SMOOTH",
-"644 887 OFFCURVE",
-"690 832 OFFCURVE",
-"690 769 CURVE SMOOTH",
-"690 737 OFFCURVE",
-"684 716 OFFCURVE",
-"676 698 CURVE",
-"742 677 LINE",
-"754 706 OFFCURVE",
-"762 728 OFFCURVE",
-"762 770 CURVE SMOOTH",
-"762 860 OFFCURVE",
-"708 957 OFFCURVE",
-"417 957 CURVE SMOOTH",
-"186 957 OFFCURVE",
-"103 891 OFFCURVE",
-"103 798 CURVE SMOOTH",
-"103 759 OFFCURVE",
-"116 732 OFFCURVE",
-"138 713 CURVE SMOOTH",
-"166 688 OFFCURVE",
-"203 677 OFFCURVE",
-"291 677 CURVE SMOOTH",
-"379 677 LINE SMOOTH",
-"526 677 OFFCURVE",
-"610 649 OFFCURVE",
-"668 587 CURVE SMOOTH",
-"722 529 OFFCURVE",
-"748 441 OFFCURVE",
-"748 322 CURVE SMOOTH",
-"748 122 OFFCURVE",
-"675 60 OFFCURVE",
-"585 60 CURVE SMOOTH",
-"481 60 OFFCURVE",
-"451 122 OFFCURVE",
-"451 208 CURVE SMOOTH",
-"451 214 LINE",
-"384 214 LINE",
-"384 208 LINE SMOOTH",
-"384 119 OFFCURVE",
-"350 60 OFFCURVE",
-"250 60 CURVE SMOOTH",
-"168 60 OFFCURVE",
-"116 111 OFFCURVE",
-"116 204 CURVE SMOOTH",
-"116 268 OFFCURVE",
-"138 311 OFFCURVE",
-"173 340 CURVE SMOOTH",
-"232 389 OFFCURVE",
-"312 389 OFFCURVE",
-"382 389 CURVE SMOOTH",
-"417 389 LINE",
-"417 430 LINE SMOOTH",
-"417 549 OFFCURVE",
-"356 612 OFFCURVE",
-"248 612 CURVE SMOOTH",
-"158 612 OFFCURVE",
-"104 572 OFFCURVE",
-"104 496 CURVE SMOOTH",
-"104 490 OFFCURVE",
-"104 481 OFFCURVE",
-"105 474 CURVE",
-"178 478 LINE",
-"177 482 OFFCURVE",
-"177 486 OFFCURVE",
-"177 489 CURVE SMOOTH",
-"177 526 OFFCURVE",
-"203 546 OFFCURVE",
-"254 546 CURVE SMOOTH",
-"305 546 OFFCURVE",
-"342 517 OFFCURVE",
-"346 455 CURVE",
-"30 455 LINE",
-"30 389 LINE",
-"50 389 LINE SMOOTH",
-"89 389 OFFCURVE",
-"147 389 OFFCURVE",
-"187 398 CURVE",
-"185 406 LINE",
-"80 365 OFFCURVE",
-"43 287 OFFCURVE",
-"43 204 CURVE SMOOTH",
-"43 65 OFFCURVE",
-"129 -11 OFFCURVE",
-"248 -11 CURVE SMOOTH",
-"337 -11 OFFCURVE",
-"377 23 OFFCURVE",
-"418 77 CURVE",
-"453 29 OFFCURVE",
-"498 -11 OFFCURVE",
-"583 -11 CURVE SMOOTH"
+"706 -11 OFFCURVE",
+"809 84 OFFCURVE",
+"809 368 CURVE SMOOTH",
+"809 630 OFFCURVE",
+"622 747 OFFCURVE",
+"353 747 CURVE SMOOTH",
+"324 747 OFFCURVE",
+"294 747 OFFCURVE",
+"265 747 CURVE SMOOTH",
+"213 747 OFFCURVE",
+"157 747 OFFCURVE",
+"157 799 CURVE SMOOTH",
+"157 858 OFFCURVE",
+"230 887 OFFCURVE",
+"392 887 CURVE SMOOTH",
+"607 887 OFFCURVE",
+"656 832 OFFCURVE",
+"656 769 CURVE SMOOTH",
+"656 737 OFFCURVE",
+"649 696 OFFCURVE",
+"591 658 CURVE",
+"658 637 LINE",
+"720 686 OFFCURVE",
+"728 728 OFFCURVE",
+"728 770 CURVE SMOOTH",
+"728 860 OFFCURVE",
+"670 957 OFFCURVE",
+"392 957 CURVE SMOOTH",
+"167 957 OFFCURVE",
+"85 891 OFFCURVE",
+"85 799 CURVE SMOOTH",
+"85 701 OFFCURVE",
+"161 677 OFFCURVE",
+"274 677 CURVE SMOOTH",
+"295 677 OFFCURVE",
+"315 677 OFFCURVE",
+"336 677 CURVE SMOOTH",
+"573 677 OFFCURVE",
+"734 597 OFFCURVE",
+"734 360 CURVE SMOOTH",
+"734 131 OFFCURVE",
+"660 60 OFFCURVE",
+"564 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 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",
+"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",
+"332 467 OFFCURVE",
+"332 434 CURVE SMOOTH",
+"332 412 LINE",
+"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",
+"115 -11 OFFCURVE",
+"234 -11 CURVE SMOOTH",
+"333 -11 OFFCURVE",
+"388 38 OFFCURVE",
+"412 94 CURVE",
+"397 94 LINE",
+"409 44 OFFCURVE",
+"467 -11 OFFCURVE",
+"566 -11 CURVE SMOOTH"
 );
 }
 );
-width = 864;
+width = 845;
 },
 {
 layerId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
@@ -248,6 +228,43 @@ paths = (
 {
 closed = 1;
 nodes = (
+"784 -11 OFFCURVE",
+"897 86 OFFCURVE",
+"897 350 CURVE SMOOTH",
+"897 614 OFFCURVE",
+"736 775 OFFCURVE",
+"430 775 CURVE SMOOTH",
+"357 775 OFFCURVE",
+"321 769 OFFCURVE",
+"272 766 CURVE SMOOTH",
+"246 764 OFFCURVE",
+"229 774 OFFCURVE",
+"229 793 CURVE SMOOTH",
+"229 834 OFFCURVE",
+"271 848 OFFCURVE",
+"443 848 CURVE SMOOTH",
+"658 848 OFFCURVE",
+"682 824 OFFCURVE",
+"682 778 CURVE SMOOTH",
+"682 759 OFFCURVE",
+"671 738 OFFCURVE",
+"627 719 CURVE",
+"724 663 LINE",
+"810 706 OFFCURVE",
+"823 753 OFFCURVE",
+"823 798 CURVE SMOOTH",
+"823 868 OFFCURVE",
+"775 979 OFFCURVE",
+"442 979 CURVE SMOOTH",
+"186 979 OFFCURVE",
+"86 917 OFFCURVE",
+"86 792 CURVE SMOOTH",
+"86 696 OFFCURVE",
+"139 643 OFFCURVE",
+"230 643 CURVE SMOOTH",
+"272 643 OFFCURVE",
+"313 653 OFFCURVE",
+"412 653 CURVE SMOOTH",
 "588 653 OFFCURVE",
 "736 562 OFFCURVE",
 "736 363 CURVE SMOOTH",
@@ -280,21 +297,22 @@ nodes = (
 "86 489 OFFCURVE",
 "87 480 OFFCURVE",
 "87 475 CURVE",
-"128 475 OFFCURVE",
-"200 475 OFFCURVE",
-"227 475 CURVE",
-"227 487 OFFCURVE",
-"238 504 OFFCURVE",
+"227 475 LINE",
+"227 476 OFFCURVE",
+"227 477 OFFCURVE",
+"227 478 CURVE SMOOTH",
+"227 489 OFFCURVE",
+"240 504 OFFCURVE",
 "267 504 CURVE SMOOTH",
-"296 504 OFFCURVE",
-"316 483 OFFCURVE",
-"313 444 CURVE",
+"305 504 OFFCURVE",
+"328 479 OFFCURVE",
+"328 443 CURVE",
+"328 416 LINE",
+"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",
@@ -302,49 +320,13 @@ nodes = (
 "41 69 OFFCURVE",
 "135 -11 OFFCURVE",
 "271 -11 CURVE SMOOTH",
-"363 -11 OFFCURVE",
-"430 38 OFFCURVE",
-"453 112 CURVE",
-"476 38 OFFCURVE",
-"547 -11 OFFCURVE",
-"633 -11 CURVE SMOOTH",
-"784 -11 OFFCURVE",
-"897 86 OFFCURVE",
-"897 350 CURVE SMOOTH",
-"897 614 OFFCURVE",
-"736 775 OFFCURVE",
-"430 775 CURVE SMOOTH",
-"357 775 OFFCURVE",
-"321 769 OFFCURVE",
-"272 766 CURVE SMOOTH",
-"246 764 OFFCURVE",
-"229 774 OFFCURVE",
-"229 793 CURVE SMOOTH",
-"229 834 OFFCURVE",
-"271 848 OFFCURVE",
-"443 848 CURVE SMOOTH",
-"658 848 OFFCURVE",
-"682 824 OFFCURVE",
-"682 778 CURVE SMOOTH",
-"682 759 OFFCURVE",
-"671 738 OFFCURVE",
-"627 719 CURVE",
-"724 663 LINE",
-"810 706 OFFCURVE",
-"823 753 OFFCURVE",
-"823 798 CURVE SMOOTH",
-"823 868 OFFCURVE",
-"775 979 OFFCURVE",
-"442 979 CURVE SMOOTH",
-"186 979 OFFCURVE",
-"86 917 OFFCURVE",
-"86 792 CURVE SMOOTH",
-"86 696 OFFCURVE",
-"139 643 OFFCURVE",
-"230 643 CURVE SMOOTH",
-"272 643 OFFCURVE",
-"313 653 OFFCURVE",
-"412 653 CURVE SMOOTH"
+"379 -11 OFFCURVE",
+"453 57 OFFCURVE",
+"461 154 CURVE",
+"445 154 LINE",
+"451 57 OFFCURVE",
+"532 -11 OFFCURVE",
+"633 -11 CURVE SMOOTH"
 );
 }
 );
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/dhiivowelsinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/dhiivowelsinh.glyph
index dac185c0..3dce026b 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/dhiivowelsinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/dhiivowelsinh.glyph
@@ -11,21 +11,14 @@ nodes = (
 "658 -11 OFFCURVE",
 "745 77 OFFCURVE",
 "745 328 CURVE SMOOTH",
-"745 476 OFFCURVE",
-"711 577 OFFCURVE",
-"642 641 CURVE SMOOTH",
-"619 663 OFFCURVE",
-"591 680 OFFCURVE",
-"561 693 CURVE",
-"499 724 OFFCURVE",
-"423 735 OFFCURVE",
+"745 620 OFFCURVE",
+"612 735 OFFCURVE",
 "320 735 CURVE SMOOTH",
-"249 735 LINE SMOOTH",
-"183 735 OFFCURVE",
-"152 741 OFFCURVE",
-"133 757 CURVE SMOOTH",
-"117 771 OFFCURVE",
-"111 789 OFFCURVE",
+"296 735 OFFCURVE",
+"273 735 OFFCURVE",
+"249 735 CURVE SMOOTH",
+"176 735 OFFCURVE",
+"111 739 OFFCURVE",
 "111 812 CURVE SMOOTH",
 "111 900 OFFCURVE",
 "217 931 OFFCURVE",
@@ -61,18 +54,14 @@ nodes = (
 "162 957 OFFCURVE",
 "84 898 OFFCURVE",
 "84 811 CURVE SMOOTH",
-"84 784 OFFCURVE",
-"91 764 OFFCURVE",
-"104 749 CURVE SMOOTH",
-"130 718 OFFCURVE",
-"172 709 OFFCURVE",
+"84 728 OFFCURVE",
+"151 709 OFFCURVE",
 "244 709 CURVE SMOOTH",
-"306 709 LINE SMOOTH",
-"467 709 OFFCURVE",
-"556 685 OFFCURVE",
-"623 622 CURVE SMOOTH",
-"687 562 OFFCURVE",
-"718 468 OFFCURVE",
+"265 709 OFFCURVE",
+"285 709 OFFCURVE",
+"306 709 CURVE SMOOTH",
+"598 709 OFFCURVE",
+"718 612 OFFCURVE",
 "718 326 CURVE SMOOTH",
 "718 95 OFFCURVE",
 "646 15 OFFCURVE",
@@ -125,21 +114,14 @@ nodes = (
 "710 -11 OFFCURVE",
 "811 79 OFFCURVE",
 "811 323 CURVE SMOOTH",
-"811 458 OFFCURVE",
-"781 557 OFFCURVE",
-"723 624 CURVE SMOOTH",
-"692 659 OFFCURVE",
-"654 684 OFFCURVE",
-"609 703 CURVE",
-"536 735 OFFCURVE",
-"472 747 OFFCURVE",
+"811 657 OFFCURVE",
+"614 747 OFFCURVE",
 "378 747 CURVE SMOOTH",
-"271 747 LINE SMOOTH",
-"219 747 OFFCURVE",
-"191 751 OFFCURVE",
-"176 764 CURVE SMOOTH",
-"167 771 OFFCURVE",
-"162 783 OFFCURVE",
+"342 747 OFFCURVE",
+"307 747 OFFCURVE",
+"271 747 CURVE SMOOTH",
+"218 747 OFFCURVE",
+"162 746 OFFCURVE",
 "162 799 CURVE SMOOTH",
 "162 858 OFFCURVE",
 "235 887 OFFCURVE",
@@ -175,18 +157,14 @@ nodes = (
 "174 957 OFFCURVE",
 "90 891 OFFCURVE",
 "90 798 CURVE SMOOTH",
-"90 759 OFFCURVE",
-"104 732 OFFCURVE",
-"125 713 CURVE SMOOTH",
-"154 688 OFFCURVE",
-"191 677 OFFCURVE",
+"90 700 OFFCURVE",
+"167 677 OFFCURVE",
 "279 677 CURVE SMOOTH",
-"367 677 LINE SMOOTH",
-"514 677 OFFCURVE",
-"598 649 OFFCURVE",
-"656 587 CURVE SMOOTH",
-"710 529 OFFCURVE",
-"736 441 OFFCURVE",
+"308 677 OFFCURVE",
+"338 677 OFFCURVE",
+"367 677 CURVE SMOOTH",
+"625 677 OFFCURVE",
+"736 577 OFFCURVE",
 "736 322 CURVE SMOOTH",
 "736 120 OFFCURVE",
 "663 60 OFFCURVE",
@@ -236,6 +214,21 @@ paths = (
 {
 closed = 1;
 nodes = (
+"766 -11 OFFCURVE",
+"879 86 OFFCURVE",
+"879 350 CURVE SMOOTH",
+"879 614 OFFCURVE",
+"718 775 OFFCURVE",
+"412 775 CURVE SMOOTH",
+"339 775 OFFCURVE",
+"303 769 OFFCURVE",
+"254 766 CURVE SMOOTH",
+"228 764 OFFCURVE",
+"211 774 OFFCURVE",
+"211 793 CURVE SMOOTH",
+"211 834 OFFCURVE",
+"253 852 OFFCURVE",
+"425 852 CURVE SMOOTH",
 "489 852 OFFCURVE",
 "548 843 OFFCURVE",
 "586 831 CURVE",
@@ -312,22 +305,7 @@ nodes = (
 "429 112 CURVE",
 "452 38 OFFCURVE",
 "523 -11 OFFCURVE",
-"609 -11 CURVE SMOOTH",
-"766 -11 OFFCURVE",
-"879 86 OFFCURVE",
-"879 350 CURVE SMOOTH",
-"879 614 OFFCURVE",
-"718 775 OFFCURVE",
-"412 775 CURVE SMOOTH",
-"339 775 OFFCURVE",
-"303 769 OFFCURVE",
-"254 766 CURVE SMOOTH",
-"228 764 OFFCURVE",
-"211 774 OFFCURVE",
-"211 793 CURVE SMOOTH",
-"211 834 OFFCURVE",
-"253 852 OFFCURVE",
-"425 852 CURVE SMOOTH"
+"609 -11 CURVE SMOOTH"
 );
 }
 );
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/jnyasinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/jnyasinh.glyph
index 3c42c902..13dace10 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/jnyasinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/jnyasinh.glyph
@@ -6,15 +6,15 @@ layers = (
 anchors = (
 {
 name = repaya;
-position = "{555.333, 730}";
+position = "{615, 730}";
 },
 {
 name = top;
-position = "{693.981, 533}";
+position = "{650, 583}";
 },
 {
 name = virama;
-position = "{987.393, 536}";
+position = "{1097, 536}";
 }
 );
 layerId = "7977A986-4EFB-4152-84F8-5A02CD382AAF";
@@ -22,174 +22,175 @@ paths = (
 {
 closed = 1;
 nodes = (
-"582 -11 OFFCURVE",
-"648 91 OFFCURVE",
-"648 221 CURVE SMOOTH",
-"648 303 OFFCURVE",
-"618 357 OFFCURVE",
-"552 357 CURVE SMOOTH",
-"516 357 OFFCURVE",
-"487 341 OFFCURVE",
-"467 319 CURVE",
-"477 312 LINE",
-"512 506 OFFCURVE",
-"606 586 OFFCURVE",
-"755 586 CURVE SMOOTH",
-"784 586 OFFCURVE",
-"811 583 OFFCURVE",
-"839 578 CURVE",
-"859 599 LINE",
-"826 608 OFFCURVE",
-"789 612 OFFCURVE",
-"756 612 CURVE SMOOTH",
-"595 612 OFFCURVE",
-"484 526 OFFCURVE",
-"450 305 CURVE",
-"475 297 LINE",
-"498 320 OFFCURVE",
-"523 331 OFFCURVE",
-"549 331 CURVE SMOOTH",
-"604 331 OFFCURVE",
-"627 288 OFFCURVE",
-"627 223 CURVE SMOOTH",
-"627 109 OFFCURVE",
-"566 15 OFFCURVE",
-"424 15 CURVE SMOOTH",
-"265 15 OFFCURVE",
-"195 123 OFFCURVE",
-"195 280 CURVE SMOOTH",
-"195 439 OFFCURVE",
-"312 528 OFFCURVE",
-"465 540 CURVE",
-"478 570 LINE",
-"453 561 LINE",
-"287 550 OFFCURVE",
-"168 446 OFFCURVE",
-"168 279 CURVE SMOOTH",
-"168 104 OFFCURVE",
-"254 -11 OFFCURVE",
-"421 -11 CURVE SMOOTH"
+"848 413 OFFCURVE",
+"681 389 OFFCURVE",
+"681 202 CURVE SMOOTH",
+"681 79 OFFCURVE",
+"790 -11 OFFCURVE",
+"968 -11 CURVE SMOOTH",
+"1045 -11 OFFCURVE",
+"1102 2 OFFCURVE",
+"1168 38 CURVE",
+"1168 61 LINE",
+"1103 28 OFFCURVE",
+"1047 15 OFFCURVE",
+"970 15 CURVE SMOOTH",
+"808 15 OFFCURVE",
+"708 90 OFFCURVE",
+"708 202 CURVE SMOOTH",
+"708 368 OFFCURVE",
+"852 387 OFFCURVE",
+"989 387 CURVE SMOOTH",
+"1148 387 LINE",
+"1148 423 LINE SMOOTH",
+"1148 519 OFFCURVE",
+"1099 612 OFFCURVE",
+"961 612 CURVE SMOOTH",
+"859 612 OFFCURVE",
+"800 552 OFFCURVE",
+"800 484 CURVE SMOOTH",
+"800 472 OFFCURVE",
+"801 463 OFFCURVE",
+"803 452 CURVE",
+"830 452 LINE",
+"828 463 OFFCURVE",
+"827 473 OFFCURVE",
+"827 482 CURVE SMOOTH",
+"827 540 OFFCURVE",
+"872 586 OFFCURVE",
+"965 586 CURVE SMOOTH",
+"1077 586 OFFCURVE",
+"1122 515 OFFCURVE",
+"1122 417 CURVE SMOOTH",
+"1122 405 LINE",
+"1139 413 LINE",
+"989 413 LINE SMOOTH"
 );
 },
 {
 closed = 1;
 nodes = (
-"40 231 OFFCURVE",
-"70 153 OFFCURVE",
-"108 83 CURVE",
-"132 96 LINE",
-"92 165 OFFCURVE",
-"67 239 OFFCURVE",
-"67 321 CURVE SMOOTH",
-"67 497 OFFCURVE",
-"169 586 OFFCURVE",
-"314 586 CURVE SMOOTH",
-"366 586 OFFCURVE",
-"412 576 OFFCURVE",
-"458 552 CURVE",
-"478 570 LINE",
-"423 598 OFFCURVE",
-"373 612 OFFCURVE",
-"313 612 CURVE SMOOTH",
-"157 612 OFFCURVE",
-"40 514 OFFCURVE",
-"40 323 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"
 );
 },
 {
 closed = 1;
 nodes = (
-"963 -11 OFFCURVE",
-"1019 2 OFFCURVE",
-"1082 38 CURVE",
-"1070 61 LINE",
-"1008 28 OFFCURVE",
-"965 15 OFFCURVE",
-"892 15 CURVE SMOOTH",
-"738 15 OFFCURVE",
-"653 90 OFFCURVE",
-"653 232 CURVE SMOOTH",
-"653 307 OFFCURVE",
-"679 357 OFFCURVE",
-"724 387 CURVE SMOOTH",
-"769 418 OFFCURVE",
-"830 429 OFFCURVE",
-"946 429 CURVE SMOOTH",
-"1060 429 LINE",
-"1060 445 LINE SMOOTH",
-"1060 545 OFFCURVE",
-"1007 612 OFFCURVE",
-"905 612 CURVE SMOOTH",
+"636 -11 OFFCURVE",
+"700 91 OFFCURVE",
+"700 218 CURVE SMOOTH",
+"700 303 OFFCURVE",
+"664 357 OFFCURVE",
+"598 357 CURVE SMOOTH",
+"562 357 OFFCURVE",
+"533 341 OFFCURVE",
+"513 319 CURVE",
+"523 312 LINE",
+"558 514 OFFCURVE",
+"650 586 OFFCURVE",
+"768 586 CURVE SMOOTH",
+"808 586 OFFCURVE",
+"844 575 OFFCURVE",
+"846 555 CURVE",
+"872 569 LINE",
+"865 597 OFFCURVE",
 "821 612 OFFCURVE",
-"775 562 OFFCURVE",
-"775 500 CURVE SMOOTH",
-"775 492 OFFCURVE",
-"775 481 OFFCURVE",
-"777 470 CURVE",
-"804 473 LINE",
-"803 480 OFFCURVE",
-"802 489 OFFCURVE",
-"802 498 CURVE SMOOTH",
-"802 556 OFFCURVE",
-"839 586 OFFCURVE",
-"905 586 CURVE SMOOTH",
-"981 586 OFFCURVE",
-"1031 540 OFFCURVE",
-"1034 455 CURVE",
-"929 455 LINE SMOOTH",
-"814 455 OFFCURVE",
-"753 441 OFFCURVE",
-"702 404 CURVE SMOOTH",
-"654 370 OFFCURVE",
-"631 312 OFFCURVE",
-"631 232 CURVE SMOOTH",
-"631 79 OFFCURVE",
-"715 -11 OFFCURVE",
-"890 -11 CURVE SMOOTH"
+"769 612 CURVE SMOOTH",
+"641 612 OFFCURVE",
+"532 537 OFFCURVE",
+"496 305 CURVE",
+"521 297 LINE",
+"544 320 OFFCURVE",
+"569 331 OFFCURVE",
+"595 331 CURVE SMOOTH",
+"650 331 OFFCURVE",
+"673 288 OFFCURVE",
+"673 219 CURVE SMOOTH",
+"673 109 OFFCURVE",
+"622 15 OFFCURVE",
+"474 15 CURVE SMOOTH",
+"327 15 OFFCURVE",
+"240 123 OFFCURVE",
+"240 284 CURVE SMOOTH",
+"240 489 OFFCURVE",
+"335 586 OFFCURVE",
+"503 586 CURVE SMOOTH",
+"516 586 OFFCURVE",
+"526 585 OFFCURVE",
+"540 583 CURVE",
+"544 609 LINE",
+"531 611 OFFCURVE",
+"513 612 OFFCURVE",
+"503 612 CURVE SMOOTH",
+"320 612 OFFCURVE",
+"213 502 OFFCURVE",
+"213 287 CURVE SMOOTH",
+"213 101 OFFCURVE",
+"316 -11 OFFCURVE",
+"471 -11 CURVE SMOOTH"
 );
 },
 {
 closed = 1;
 nodes = (
-"1055 -271 OFFCURVE",
-"1090 -268 OFFCURVE",
-"1110 -257 CURVE",
-"1104 -233 LINE",
-"1086 -240 OFFCURVE",
-"1060 -245 OFFCURVE",
-"1036 -245 CURVE SMOOTH",
-"947 -245 OFFCURVE",
-"919 -197 OFFCURVE",
-"919 -142 CURVE SMOOTH",
-"919 -80 OFFCURVE",
-"961 -27 OFFCURVE",
-"1019 13 CURVE",
-"1000 19 LINE",
-"983 15 LINE",
-"933 -23 OFFCURVE",
-"892 -75 OFFCURVE",
-"892 -142 CURVE SMOOTH",
-"892 -209 OFFCURVE",
-"931 -271 OFFCURVE",
-"1036 -271 CURVE SMOOTH"
+"1143 -271 OFFCURVE",
+"1174 -268 OFFCURVE",
+"1194 -257 CURVE",
+"1194 -233 LINE",
+"1176 -240 OFFCURVE",
+"1148 -245 OFFCURVE",
+"1124 -245 CURVE SMOOTH",
+"1035 -245 OFFCURVE",
+"1007 -197 OFFCURVE",
+"1007 -142 CURVE SMOOTH",
+"1007 -80 OFFCURVE",
+"1061 -11 OFFCURVE",
+"1119 15 CURVE",
+"1088 19 LINE",
+"1071 10 LINE",
+"1021 -28 OFFCURVE",
+"980 -75 OFFCURVE",
+"980 -142 CURVE SMOOTH",
+"980 -209 OFFCURVE",
+"1019 -271 OFFCURVE",
+"1124 -271 CURVE SMOOTH"
 );
 }
 );
-width = 1092;
+width = 1180;
 },
 {
 anchors = (
 {
 name = repaya;
-position = "{595, 730}";
+position = "{633, 730}";
 },
 {
 name = top;
-position = "{674, 563}";
+position = "{696, 583}";
 },
 {
 name = virama;
-position = "{1057.921, 536}";
+position = "{1077, 536}";
 }
 );
 layerId = UUID0;
@@ -197,180 +198,175 @@ 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"
+"836 425 OFFCURVE",
+"680 377 OFFCURVE",
+"680 203 CURVE SMOOTH",
+"680 42 OFFCURVE",
+"823 -11 OFFCURVE",
+"988 -11 CURVE SMOOTH",
+"1057 -11 OFFCURVE",
+"1126 -5 OFFCURVE",
+"1203 34 CURVE",
+"1203 101 LINE",
+"1137 70 OFFCURVE",
+"1065 60 OFFCURVE",
+"996 60 CURVE SMOOTH",
+"838 60 OFFCURVE",
+"756 112 OFFCURVE",
+"756 199 CURVE SMOOTH",
+"756 332 OFFCURVE",
+"871 359 OFFCURVE",
+"1028 359 CURVE SMOOTH",
+"1193 359 LINE",
+"1193 419 LINE SMOOTH",
+"1193 510 OFFCURVE",
+"1124 612 OFFCURVE",
+"995 612 CURVE SMOOTH",
+"883 612 OFFCURVE",
+"811 547 OFFCURVE",
+"811 462 CURVE SMOOTH",
+"811 460 OFFCURVE",
+"811 460 OFFCURVE",
+"811 458 CURVE",
+"885 458 LINE",
+"885 460 OFFCURVE",
+"885 460 OFFCURVE",
+"885 462 CURVE SMOOTH",
+"885 500 OFFCURVE",
+"915 546 OFFCURVE",
+"997 546 CURVE SMOOTH",
+"1084 546 OFFCURVE",
+"1120 485 OFFCURVE",
+"1120 426 CURVE SMOOTH",
+"1120 412 LINE",
+"1144 425 LINE",
+"1020 425 LINE 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"
+"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"
 );
 },
 {
 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"
+"649 -11 OFFCURVE",
+"742 89 OFFCURVE",
+"742 223 CURVE SMOOTH",
+"742 310 OFFCURVE",
+"697 358 OFFCURVE",
+"626 358 CURVE SMOOTH",
+"607 358 OFFCURVE",
+"582 352 OFFCURVE",
+"567 342 CURVE",
+"577 341 LINE",
+"619 498 OFFCURVE",
+"696 541 OFFCURVE",
+"781 541 CURVE SMOOTH",
+"841 541 OFFCURVE",
+"889 516 OFFCURVE",
+"851 472 CURVE",
+"909 524 LINE",
+"935 580 OFFCURVE",
+"870 612 OFFCURVE",
+"784 612 CURVE SMOOTH",
+"682 612 OFFCURVE",
+"540 556 OFFCURVE",
+"500 296 CURVE",
+"571 274 LINE",
+"587 287 OFFCURVE",
+"603 292 OFFCURVE",
+"620 292 CURVE SMOOTH",
+"649 292 OFFCURVE",
+"669 274 OFFCURVE",
+"669 224 CURVE SMOOTH",
+"669 128 OFFCURVE",
+"606 60 OFFCURVE",
+"487 60 CURVE SMOOTH",
+"347 60 OFFCURVE",
+"283 156 OFFCURVE",
+"283 291 CURVE SMOOTH",
+"283 451 OFFCURVE",
+"351 543 OFFCURVE",
+"507 543 CURVE SMOOTH",
+"518 543 OFFCURVE",
+"525 543 OFFCURVE",
+"547 541 CURVE",
+"554 609 LINE",
+"539 611 OFFCURVE",
+"515 612 OFFCURVE",
+"504 612 CURVE SMOOTH",
+"330 612 OFFCURVE",
+"208 499 OFFCURVE",
+"208 296 CURVE SMOOTH",
+"208 106 OFFCURVE",
+"307 -11 OFFCURVE",
+"487 -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"
+"1171 -271 OFFCURVE",
+"1199 -266 OFFCURVE",
+"1231 -251 CURVE",
+"1231 -187 LINE",
+"1210 -197 OFFCURVE",
+"1173 -203 OFFCURVE",
+"1149 -203 CURVE SMOOTH",
+"1086 -203 OFFCURVE",
+"1053 -175 OFFCURVE",
+"1053 -129 CURVE SMOOTH",
+"1053 -62 OFFCURVE",
+"1091 -20 OFFCURVE",
+"1167 18 CURVE",
+"1149 54 LINE",
+"1114 41 LINE",
+"1037 -2 OFFCURVE",
+"979 -57 OFFCURVE",
+"979 -141 CURVE SMOOTH",
+"979 -214 OFFCURVE",
+"1034 -271 OFFCURVE",
+"1134 -271 CURVE SMOOTH"
 );
 }
 );
-width = 1170;
+width = 1221;
 },
 {
 anchors = (
 {
 name = repaya;
-position = "{652.974, 730}";
+position = "{683, 730}";
 },
 {
 name = top;
-position = "{816, 533}";
+position = "{791, 583}";
 },
 {
 name = virama;
-position = "{1161, 536}";
-}
-);
-components = (
-{
-name = dasinh;
-transform = "{1, 0, 0, 1, 710, 0}";
+position = "{1191, 536}";
 }
 );
 layerId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
@@ -378,89 +374,161 @@ paths = (
 {
 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"
+"921 444 OFFCURVE",
+"770 400 OFFCURVE",
+"770 224 CURVE SMOOTH",
+"770 72 OFFCURVE",
+"881 -11 OFFCURVE",
+"1108 -11 CURVE SMOOTH",
+"1232 -11 OFFCURVE",
+"1292 -5 OFFCURVE",
+"1372 24 CURVE",
+"1372 151 LINE",
+"1297 126 OFFCURVE",
+"1221 116 OFFCURVE",
+"1143 116 CURVE SMOOTH",
+"1008 116 OFFCURVE",
+"948 154 OFFCURVE",
+"948 229 CURVE SMOOTH",
+"948 326 OFFCURVE",
+"1040 323 OFFCURVE",
+"1115 323 CURVE SMOOTH",
+"1361 323 LINE",
+"1361 401 LINE SMOOTH",
+"1361 542 OFFCURVE",
+"1269 626 OFFCURVE",
+"1109 626 CURVE SMOOTH",
+"975 626 OFFCURVE",
+"932 564 OFFCURVE",
+"932 488 CURVE SMOOTH",
+"932 480 OFFCURVE",
+"932 476 OFFCURVE",
+"934 463 CURVE",
+"1068 463 LINE",
+"1068 464 OFFCURVE",
+"1068 465 OFFCURVE",
+"1068 466 CURVE SMOOTH",
+"1068 489 OFFCURVE",
+"1094 501 OFFCURVE",
+"1128 501 CURVE SMOOTH",
+"1203 501 OFFCURVE",
+"1218 451 OFFCURVE",
+"1218 424 CURVE SMOOTH",
+"1218 400 LINE",
+"1284 444 LINE",
+"1069 444 LINE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"20 164 OFFCURVE",
+"50 70 OFFCURVE",
+"103 0 CURVE",
+"239 38 LINE",
+"186 116 OFFCURVE",
+"160 188 OFFCURVE",
+"160 271 CURVE SMOOTH",
+"160 362 OFFCURVE",
+"201 522 OFFCURVE",
+"432 522 CURVE SMOOTH",
+"475 522 OFFCURVE",
+"507 514 OFFCURVE",
+"524 511 CURVE",
+"589 621 LINE",
+"541 631 OFFCURVE",
+"524 636 OFFCURVE",
+"458 636 CURVE SMOOTH",
+"162 636 OFFCURVE",
+"20 493 OFFCURVE",
+"20 262 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"765 -11 OFFCURVE",
+"895 98 OFFCURVE",
+"895 229 CURVE SMOOTH",
+"895 340 OFFCURVE",
+"796 371 OFFCURVE",
+"737 371 CURVE SMOOTH",
+"723 371 OFFCURVE",
+"686 363 OFFCURVE",
+"673 360 CURVE",
+"719 350 LINE",
+"732 412 OFFCURVE",
+"791 504 OFFCURVE",
+"873 504 CURVE SMOOTH",
+"908 504 OFFCURVE",
+"926 493 OFFCURVE",
+"932 475 CURVE",
+"1064 476 LINE",
+"1020 543 OFFCURVE",
+"994 622 OFFCURVE",
+"880 622 CURVE SMOOTH",
+"765 622 OFFCURVE",
+"622 563 OFFCURVE",
+"566 291 CURVE",
+"669 255 LINE",
+"671 268 OFFCURVE",
+"688 281 OFFCURVE",
+"711 281 CURVE SMOOTH",
+"742 281 OFFCURVE",
+"755 260 OFFCURVE",
+"755 235 CURVE SMOOTH",
+"755 184 OFFCURVE",
+"687 143 OFFCURVE",
+"594 143 CURVE SMOOTH",
+"492 143 OFFCURVE",
+"432 197 OFFCURVE",
+"432 308 CURVE SMOOTH",
+"432 415 OFFCURVE",
+"468 487 OFFCURVE",
+"589 487 CURVE SMOOTH",
+"609 487 OFFCURVE",
+"611 487 OFFCURVE",
+"622 486 CURVE",
+"629 620 LINE",
+"613 622 OFFCURVE",
+"608 622 OFFCURVE",
+"591 622 CURVE SMOOTH",
+"386 622 OFFCURVE",
+"263 507 OFFCURVE",
+"263 302 CURVE SMOOTH",
+"263 115 OFFCURVE",
+"370 -11 OFFCURVE",
+"580 -11 CURVE SMOOTH"
 );
 },
 {
 closed = 1;
 nodes = (
-"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"
+"1305 -271 OFFCURVE",
+"1332 -262 OFFCURVE",
+"1374 -248 CURVE",
+"1374 -126 LINE",
+"1349 -135 OFFCURVE",
+"1320 -141 OFFCURVE",
+"1291 -141 CURVE SMOOTH",
+"1251 -141 OFFCURVE",
+"1224 -123 OFFCURVE",
+"1224 -90 CURVE SMOOTH",
+"1224 -48 OFFCURVE",
+"1273 -9 OFFCURVE",
+"1348 16 CURVE",
+"1321 61 LINE",
+"1263 46 LINE",
+"1118 -7 OFFCURVE",
+"1068 -56 OFFCURVE",
+"1068 -136 CURVE SMOOTH",
+"1068 -211 OFFCURVE",
+"1133 -271 OFFCURVE",
+"1255 -271 CURVE SMOOTH"
 );
 }
 );
-width = 1345;
+width = 1385;
 },
 {
 anchors = (
@@ -1519,6 +1587,7 @@ nodes = (
 width = 1170;
 }
 );
+leftMetricsKey = gasinh;
 rightKerningGroup = dasinh;
 rightMetricsKey = dasinh;
 unicode = 0DA5;
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/khiivowelsinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/khiivowelsinh.glyph
index 5f6445bb..876a0aaa 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/khiivowelsinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/khiivowelsinh.glyph
@@ -8,80 +8,21 @@ paths = (
 {
 closed = 1;
 nodes = (
-"316 -11 OFFCURVE",
-"358 38 OFFCURVE",
-"358 99 CURVE SMOOTH",
-"358 162 OFFCURVE",
-"318 206 OFFCURVE",
-"247 206 CURVE SMOOTH",
-"174 206 OFFCURVE",
-"125 158 OFFCURVE",
-"82 109 CURVE",
-"95 83 LINE",
-"138 137 OFFCURVE",
-"184 180 OFFCURVE",
-"245 180 CURVE SMOOTH",
-"307 180 OFFCURVE",
-"331 144 OFFCURVE",
-"331 99 CURVE SMOOTH",
-"331 58 OFFCURVE",
-"308 15 OFFCURVE",
-"230 15 CURVE SMOOTH",
-"160 15 OFFCURVE",
-"119 54 OFFCURVE",
-"95 105 CURVE SMOOTH",
-"75 148 OFFCURVE",
-"68 200 OFFCURVE",
-"68 243 CURVE SMOOTH",
-"68 424 OFFCURVE",
-"184 521 OFFCURVE",
-"313 521 CURVE SMOOTH",
-"467 521 OFFCURVE",
-"511 413 OFFCURVE",
-"511 317 CURVE SMOOTH",
-"511 208 OFFCURVE",
-"462 101 OFFCURVE",
-"364 8 CURVE",
-"383 -11 LINE",
-"481 92 OFFCURVE",
-"537 186 OFFCURVE",
-"537 319 CURVE SMOOTH",
-"537 424 OFFCURVE",
-"484 547 OFFCURVE",
-"315 547 CURVE SMOOTH",
-"171 547 OFFCURVE",
-"41 442 OFFCURVE",
-"41 242 CURVE SMOOTH",
-"41 122 OFFCURVE",
-"93 -11 OFFCURVE",
-"229 -11 CURVE SMOOTH"
-);
-},
-{
-closed = 1;
-nodes = (
 "688 -11 OFFCURVE",
 "780 84 OFFCURVE",
 "780 333 CURVE SMOOTH",
-"780 487 OFFCURVE",
-"740 590 OFFCURVE",
-"665 650 CURVE SMOOTH",
-"643 668 OFFCURVE",
-"619 682 OFFCURVE",
-"591 692 CURVE",
-"520 725 OFFCURVE",
-"451 735 OFFCURVE",
+"780 632 OFFCURVE",
+"629 735 OFFCURVE",
 "338 735 CURVE SMOOTH",
-"269 735 LINE SMOOTH",
-"203 735 OFFCURVE",
-"172 741 OFFCURVE",
-"153 757 CURVE SMOOTH",
-"137 771 OFFCURVE",
-"131 789 OFFCURVE",
+"315 735 OFFCURVE",
+"292 735 OFFCURVE",
+"269 735 CURVE SMOOTH",
+"196 735 OFFCURVE",
+"131 739 OFFCURVE",
 "131 812 CURVE SMOOTH",
 "131 900 OFFCURVE",
 "237 931 OFFCURVE",
-"398 931 CURVE",
+"398 931 CURVE SMOOTH",
 "497 931 OFFCURVE",
 "575 921 OFFCURVE",
 "630 894 CURVE",
@@ -113,18 +54,14 @@ nodes = (
 "182 957 OFFCURVE",
 "104 898 OFFCURVE",
 "104 811 CURVE SMOOTH",
-"104 784 OFFCURVE",
-"111 764 OFFCURVE",
-"124 749 CURVE SMOOTH",
-"150 718 OFFCURVE",
-"192 709 OFFCURVE",
+"104 728 OFFCURVE",
+"169 709 OFFCURVE",
 "266 709 CURVE SMOOTH",
-"334 709 LINE SMOOTH",
-"482 709 OFFCURVE",
-"579 687 OFFCURVE",
-"649 629 CURVE SMOOTH",
-"718 571 OFFCURVE",
-"753 477 OFFCURVE",
+"289 709 OFFCURVE",
+"311 709 OFFCURVE",
+"334 709 CURVE SMOOTH",
+"619 709 OFFCURVE",
+"753 618 OFFCURVE",
 "753 333 CURVE SMOOTH",
 "753 98 OFFCURVE",
 "671 15 OFFCURVE",
@@ -138,6 +75,58 @@ nodes = (
 "501 -11 OFFCURVE",
 "585 -11 CURVE SMOOTH"
 );
+},
+{
+closed = 1;
+nodes = (
+"316 -11 OFFCURVE",
+"358 38 OFFCURVE",
+"358 99 CURVE SMOOTH",
+"358 162 OFFCURVE",
+"318 206 OFFCURVE",
+"247 206 CURVE SMOOTH",
+"174 206 OFFCURVE",
+"125 158 OFFCURVE",
+"82 109 CURVE",
+"95 83 LINE",
+"138 137 OFFCURVE",
+"184 180 OFFCURVE",
+"245 180 CURVE SMOOTH",
+"307 180 OFFCURVE",
+"331 144 OFFCURVE",
+"331 99 CURVE SMOOTH",
+"331 58 OFFCURVE",
+"308 15 OFFCURVE",
+"230 15 CURVE SMOOTH",
+"160 15 OFFCURVE",
+"119 54 OFFCURVE",
+"95 105 CURVE SMOOTH",
+"75 148 OFFCURVE",
+"68 200 OFFCURVE",
+"68 243 CURVE SMOOTH",
+"68 424 OFFCURVE",
+"174 521 OFFCURVE",
+"293 521 CURVE SMOOTH",
+"455 521 OFFCURVE",
+"511 413 OFFCURVE",
+"511 307 CURVE SMOOTH",
+"511 198 OFFCURVE",
+"472 93 OFFCURVE",
+"404 0 CURVE",
+"437 0 LINE",
+"505 103 OFFCURVE",
+"537 186 OFFCURVE",
+"537 309 CURVE SMOOTH",
+"537 424 OFFCURVE",
+"472 547 OFFCURVE",
+"295 547 CURVE SMOOTH",
+"161 547 OFFCURVE",
+"41 442 OFFCURVE",
+"41 242 CURVE SMOOTH",
+"41 122 OFFCURVE",
+"93 -11 OFFCURVE",
+"229 -11 CURVE SMOOTH"
+);
 }
 );
 width = 821;
@@ -148,76 +137,17 @@ paths = (
 {
 closed = 1;
 nodes = (
-"348 -11 OFFCURVE",
-"395 39 OFFCURVE",
-"395 116 CURVE SMOOTH",
-"395 176 OFFCURVE",
-"354 234 OFFCURVE",
-"267 234 CURVE SMOOTH",
-"201 234 OFFCURVE",
-"150 196 OFFCURVE",
-"114 152 CURVE",
-"147 99 LINE",
-"184 146 OFFCURVE",
-"220 167 OFFCURVE",
-"261 167 CURVE SMOOTH",
-"303 167 OFFCURVE",
-"323 143 OFFCURVE",
-"323 114 CURVE SMOOTH",
-"323 79 OFFCURVE",
-"304 57 OFFCURVE",
-"249 57 CURVE SMOOTH",
-"189 57 OFFCURVE",
-"153 86 OFFCURVE",
-"132 129 CURVE",
-"114 163 OFFCURVE",
-"109 204 OFFCURVE",
-"109 247 CURVE SMOOTH",
-"109 395 OFFCURVE",
-"198 486 OFFCURVE",
-"332 486 CURVE SMOOTH",
-"457 486 OFFCURVE",
-"514 408 OFFCURVE",
-"514 308 CURVE SMOOTH",
-"514 203 OFFCURVE",
-"469 122 OFFCURVE",
-"390 36 CURVE",
-"443 -11 LINE",
-"524 87 OFFCURVE",
-"586 185 OFFCURVE",
-"586 313 CURVE SMOOTH",
-"586 444 OFFCURVE",
-"513 555 OFFCURVE",
-"333 555 CURVE SMOOTH",
-"154 555 OFFCURVE",
-"36 431 OFFCURVE",
-"36 246 CURVE SMOOTH",
-"36 104 OFFCURVE",
-"116 -11 OFFCURVE",
-"250 -11 CURVE SMOOTH"
-);
-},
-{
-closed = 1;
-nodes = (
 "735 -11 OFFCURVE",
 "838 69 OFFCURVE",
 "838 332 CURVE SMOOTH",
-"838 462 OFFCURVE",
-"809 556 OFFCURVE",
-"750 624 CURVE",
-"717 660 OFFCURVE",
-"678 685 OFFCURVE",
-"630 705 CURVE",
-"563 735 OFFCURVE",
-"496 747 OFFCURVE",
+"838 663 OFFCURVE",
+"625 747 OFFCURVE",
 "410 747 CURVE SMOOTH",
-"285 747 LINE SMOOTH",
+"368 747 OFFCURVE",
+"327 747 OFFCURVE",
+"285 747 CURVE SMOOTH",
 "232 747 OFFCURVE",
-"204 751 OFFCURVE",
-"189 764 CURVE SMOOTH",
-"181 771 OFFCURVE",
-"176 783 OFFCURVE",
+"176 746 OFFCURVE",
 "176 799 CURVE SMOOTH",
 "176 858 OFFCURVE",
 "248 887 OFFCURVE",
@@ -253,18 +183,14 @@ nodes = (
 "187 957 OFFCURVE",
 "104 891 OFFCURVE",
 "104 798 CURVE SMOOTH",
-"104 759 OFFCURVE",
-"117 732 OFFCURVE",
-"139 713 CURVE SMOOTH",
-"167 688 OFFCURVE",
-"204 677 OFFCURVE",
+"104 700 OFFCURVE",
+"180 677 OFFCURVE",
 "292 677 CURVE SMOOTH",
-"394 677 LINE SMOOTH",
-"537 677 OFFCURVE",
-"624 649 OFFCURVE",
-"682 587 CURVE SMOOTH",
-"736 529 OFFCURVE",
-"762 449 OFFCURVE",
+"326 677 OFFCURVE",
+"360 677 OFFCURVE",
+"394 677 CURVE SMOOTH",
+"645 677 OFFCURVE",
+"762 580 OFFCURVE",
 "762 333 CURVE SMOOTH",
 "762 112 OFFCURVE",
 "688 59 OFFCURVE",
@@ -278,6 +204,58 @@ nodes = (
 "524 -11 OFFCURVE",
 "624 -11 CURVE SMOOTH"
 );
+},
+{
+closed = 1;
+nodes = (
+"348 -11 OFFCURVE",
+"395 39 OFFCURVE",
+"395 116 CURVE SMOOTH",
+"395 176 OFFCURVE",
+"354 234 OFFCURVE",
+"267 234 CURVE SMOOTH",
+"201 234 OFFCURVE",
+"150 196 OFFCURVE",
+"114 152 CURVE",
+"147 99 LINE",
+"184 146 OFFCURVE",
+"220 167 OFFCURVE",
+"261 167 CURVE SMOOTH",
+"303 167 OFFCURVE",
+"323 143 OFFCURVE",
+"323 114 CURVE SMOOTH",
+"323 79 OFFCURVE",
+"304 57 OFFCURVE",
+"249 57 CURVE SMOOTH",
+"189 57 OFFCURVE",
+"153 86 OFFCURVE",
+"132 129 CURVE",
+"114 163 OFFCURVE",
+"109 204 OFFCURVE",
+"109 247 CURVE SMOOTH",
+"109 395 OFFCURVE",
+"198 486 OFFCURVE",
+"320 486 CURVE SMOOTH",
+"437 486 OFFCURVE",
+"514 406 OFFCURVE",
+"514 296 CURVE SMOOTH",
+"514 201 OFFCURVE",
+"474 87 OFFCURVE",
+"415 1 CURVE",
+"488 0 LINE",
+"549 98 OFFCURVE",
+"586 183 OFFCURVE",
+"586 301 CURVE SMOOTH",
+"586 442 OFFCURVE",
+"493 555 OFFCURVE",
+"321 555 CURVE SMOOTH",
+"154 555 OFFCURVE",
+"36 424 OFFCURVE",
+"36 238 CURVE SMOOTH",
+"36 104 OFFCURVE",
+"116 -11 OFFCURVE",
+"250 -11 CURVE SMOOTH"
+);
 }
 );
 width = 874;
@@ -288,6 +266,21 @@ paths = (
 {
 closed = 1;
 nodes = (
+"808 -11 OFFCURVE",
+"908 102 OFFCURVE",
+"908 331 CURVE SMOOTH",
+"908 595 OFFCURVE",
+"747 775 OFFCURVE",
+"441 775 CURVE SMOOTH",
+"368 775 OFFCURVE",
+"332 769 OFFCURVE",
+"283 766 CURVE SMOOTH",
+"257 764 OFFCURVE",
+"240 774 OFFCURVE",
+"240 793 CURVE SMOOTH",
+"240 834 OFFCURVE",
+"282 852 OFFCURVE",
+"454 852 CURVE SMOOTH",
 "518 852 OFFCURVE",
 "577 843 OFFCURVE",
 "615 831 CURVE",
@@ -338,22 +331,7 @@ nodes = (
 "547 136 LINE",
 "556 22 OFFCURVE",
 "613 -11 OFFCURVE",
-"689 -11 CURVE SMOOTH",
-"808 -11 OFFCURVE",
-"908 102 OFFCURVE",
-"908 331 CURVE SMOOTH",
-"908 595 OFFCURVE",
-"747 775 OFFCURVE",
-"441 775 CURVE SMOOTH",
-"368 775 OFFCURVE",
-"332 769 OFFCURVE",
-"283 766 CURVE SMOOTH",
-"257 764 OFFCURVE",
-"240 774 OFFCURVE",
-"240 793 CURVE SMOOTH",
-"240 834 OFFCURVE",
-"282 852 OFFCURVE",
-"454 852 CURVE SMOOTH"
+"689 -11 CURVE SMOOTH"
 );
 },
 {
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/mbahalantsinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/mbahalantsinh.glyph
index 3c45a922..075ed77d 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/mbahalantsinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/mbahalantsinh.glyph
@@ -473,9 +473,10 @@ nodes = (
 "600 85 OFFCURVE",
 "618 108 OFFCURVE",
 "618 142 CURVE SMOOTH",
-"618 207 OFFCURVE",
-"554 223 OFFCURVE",
-"430 223 CURVE SMOOTH",
+"618 206 OFFCURVE",
+"557 222 OFFCURVE",
+"438 223 CURVE",
+"430 223 LINE",
 "313 223 OFFCURVE",
 "241 213 OFFCURVE",
 "241 142 CURVE SMOOTH",
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/mbiivowelsinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/mbiivowelsinh.glyph
index 39deddf4..b23c77a8 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/mbiivowelsinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/mbiivowelsinh.glyph
@@ -81,28 +81,6 @@ nodes = (
 {
 closed = 1;
 nodes = (
-"697 -11 OFFCURVE",
-"791 107 OFFCURVE",
-"791 343 CURVE SMOOTH",
-"791 482 OFFCURVE",
-"747 576 OFFCURVE",
-"681 636 CURVE SMOOTH",
-"654 660 OFFCURVE",
-"627 678 OFFCURVE",
-"594 693 CURVE",
-"528 724 OFFCURVE",
-"453 735 OFFCURVE",
-"363 735 CURVE SMOOTH",
-"263 735 LINE SMOOTH",
-"197 735 OFFCURVE",
-"166 741 OFFCURVE",
-"147 757 CURVE SMOOTH",
-"131 771 OFFCURVE",
-"125 789 OFFCURVE",
-"125 812 CURVE SMOOTH",
-"125 900 OFFCURVE",
-"231 931 OFFCURVE",
-"398 931 CURVE SMOOTH",
 "502 931 OFFCURVE",
 "580 921 OFFCURVE",
 "635 894 CURVE",
@@ -134,18 +112,14 @@ nodes = (
 "172 957 OFFCURVE",
 "98 898 OFFCURVE",
 "98 811 CURVE SMOOTH",
-"98 784 OFFCURVE",
-"105 764 OFFCURVE",
-"118 749 CURVE SMOOTH",
-"144 718 OFFCURVE",
-"186 709 OFFCURVE",
+"98 728 OFFCURVE",
+"165 709 OFFCURVE",
 "258 709 CURVE SMOOTH",
-"356 709 LINE SMOOTH",
-"490 709 OFFCURVE",
-"589 685 OFFCURVE",
-"665 615 CURVE SMOOTH",
-"726 559 OFFCURVE",
-"764 468 OFFCURVE",
+"291 709 OFFCURVE",
+"323 709 OFFCURVE",
+"356 709 CURVE SMOOTH",
+"615 709 OFFCURVE",
+"764 601 OFFCURVE",
 "764 344 CURVE SMOOTH",
 "764 130 OFFCURVE",
 "686 15 OFFCURVE",
@@ -156,7 +130,22 @@ nodes = (
 "439 3 LINE",
 "469 -8 OFFCURVE",
 "508 -11 OFFCURVE",
-"527 -11 CURVE SMOOTH"
+"527 -11 CURVE SMOOTH",
+"697 -11 OFFCURVE",
+"791 107 OFFCURVE",
+"791 343 CURVE SMOOTH",
+"791 610 OFFCURVE",
+"632 735 OFFCURVE",
+"363 735 CURVE SMOOTH",
+"330 735 OFFCURVE",
+"296 735 OFFCURVE",
+"263 735 CURVE SMOOTH",
+"190 735 OFFCURVE",
+"125 739 OFFCURVE",
+"125 812 CURVE SMOOTH",
+"125 900 OFFCURVE",
+"231 931 OFFCURVE",
+"398 931 CURVE SMOOTH"
 );
 },
 {
@@ -275,28 +264,6 @@ nodes = (
 {
 closed = 1;
 nodes = (
-"755 -10 OFFCURVE",
-"838 144 OFFCURVE",
-"838 347 CURVE SMOOTH",
-"838 474 OFFCURVE",
-"805 570 OFFCURVE",
-"737 637 CURVE SMOOTH",
-"707 666 OFFCURVE",
-"672 687 OFFCURVE",
-"631 704 CURVE SMOOTH",
-"563 734 OFFCURVE",
-"495 747 OFFCURVE",
-"393 747 CURVE SMOOTH",
-"280 747 LINE SMOOTH",
-"227 747 OFFCURVE",
-"198 751 OFFCURVE",
-"184 764 CURVE SMOOTH",
-"176 771 OFFCURVE",
-"171 783 OFFCURVE",
-"171 799 CURVE SMOOTH",
-"171 858 OFFCURVE",
-"243 887 OFFCURVE",
-"425 887 CURVE SMOOTH",
 "492 887 OFFCURVE",
 "550 881 OFFCURVE",
 "587 874 CURVE",
@@ -328,18 +295,14 @@ nodes = (
 "182 957 OFFCURVE",
 "99 891 OFFCURVE",
 "99 798 CURVE SMOOTH",
-"99 759 OFFCURVE",
-"112 732 OFFCURVE",
-"134 713 CURVE SMOOTH",
-"161 689 OFFCURVE",
-"199 677 OFFCURVE",
+"99 700 OFFCURVE",
+"175 677 OFFCURVE",
 "287 677 CURVE SMOOTH",
-"381 677 LINE SMOOTH",
-"538 677 OFFCURVE",
-"618 651 OFFCURVE",
-"680 593 CURVE SMOOTH",
-"736 540 OFFCURVE",
-"764 460 OFFCURVE",
+"318 677 OFFCURVE",
+"350 677 OFFCURVE",
+"381 677 CURVE SMOOTH",
+"632 677 OFFCURVE",
+"764 596 OFFCURVE",
 "764 349 CURVE SMOOTH",
 "764 177 OFFCURVE",
 "703 57 OFFCURVE",
@@ -350,7 +313,22 @@ nodes = (
 "457 1 LINE",
 "482 -7 OFFCURVE",
 "516 -10 OFFCURVE",
-"561 -10 CURVE SMOOTH"
+"561 -10 CURVE SMOOTH",
+"755 -10 OFFCURVE",
+"838 144 OFFCURVE",
+"838 347 CURVE SMOOTH",
+"838 627 OFFCURVE",
+"671 747 OFFCURVE",
+"393 747 CURVE SMOOTH",
+"355 747 OFFCURVE",
+"318 747 OFFCURVE",
+"280 747 CURVE SMOOTH",
+"227 747 OFFCURVE",
+"171 746 OFFCURVE",
+"171 799 CURVE SMOOTH",
+"171 858 OFFCURVE",
+"243 887 OFFCURVE",
+"425 887 CURVE SMOOTH"
 );
 },
 {
@@ -396,6 +374,10 @@ paths = (
 {
 closed = 1;
 nodes = (
+"318 -17 OFFCURVE",
+"355 -12 OFFCURVE",
+"396 -6 CURVE",
+"388 83 LINE",
 "354 83 OFFCURVE",
 "333 83 OFFCURVE",
 "275 83 CURVE",
@@ -459,46 +441,7 @@ nodes = (
 "20 284 CURVE SMOOTH",
 "20 97 OFFCURVE",
 "93 -17 OFFCURVE",
-"251 -17 CURVE SMOOTH",
-"318 -17 OFFCURVE",
-"355 -12 OFFCURVE",
-"396 -6 CURVE",
-"393 27 OFFCURVE",
-"388 76 OFFCURVE",
-"388 83 CURVE"
-);
-},
-{
-closed = 1;
-nodes = (
-"483 130 OFFCURVE",
-"492 122 OFFCURVE",
-"492 105 CURVE SMOOTH",
-"492 91 OFFCURVE",
-"474 82 OFFCURVE",
-"454 82 CURVE",
-"450 -7 LINE",
-"548 67 LINE",
-"600 85 OFFCURVE",
-"618 108 OFFCURVE",
-"618 142 CURVE SMOOTH",
-"618 207 OFFCURVE",
-"554 223 OFFCURVE",
-"430 223 CURVE SMOOTH",
-"313 223 OFFCURVE",
-"241 213 OFFCURVE",
-"241 142 CURVE SMOOTH",
-"241 112 OFFCURVE",
-"264 83 OFFCURVE",
-"309 67 CURVE",
-"396 -7 LINE",
-"388 83 LINE",
-"367 83 OFFCURVE",
-"359 93 OFFCURVE",
-"359 105 CURVE SMOOTH",
-"359 118 OFFCURVE",
-"368 130 OFFCURVE",
-"431 130 CURVE SMOOTH"
+"251 -17 CURVE SMOOTH"
 );
 },
 {
@@ -547,12 +490,10 @@ nodes = (
 "744 223 OFFCURVE",
 "693 75 OFFCURVE",
 "591 91 CURVE",
-"540 91 OFFCURVE",
+"540 81 OFFCURVE",
 "485 82 OFFCURVE",
 "454 82 CURVE",
-"454 62 OFFCURVE",
-"450 18 OFFCURVE",
-"450 -7 CURVE",
+"450 -7 LINE",
 "497 -12 OFFCURVE",
 "560 -17 OFFCURVE",
 "609 -17 CURVE SMOOTH",
@@ -574,9 +515,37 @@ nodes = (
 );
 },
 {
-closed = 0;
+closed = 1;
 nodes = (
-"638 740 LINE"
+"483 130 OFFCURVE",
+"492 122 OFFCURVE",
+"492 105 CURVE SMOOTH",
+"492 91 OFFCURVE",
+"474 82 OFFCURVE",
+"454 82 CURVE",
+"450 -7 LINE",
+"548 67 LINE",
+"600 85 OFFCURVE",
+"618 108 OFFCURVE",
+"618 142 CURVE SMOOTH",
+"618 205 OFFCURVE",
+"559 223 OFFCURVE",
+"444 223 CURVE SMOOTH",
+"430 223 LINE SMOOTH",
+"313 223 OFFCURVE",
+"241 213 OFFCURVE",
+"241 142 CURVE SMOOTH",
+"241 112 OFFCURVE",
+"264 83 OFFCURVE",
+"309 67 CURVE",
+"395 -4 LINE",
+"388 83 LINE",
+"367 83 OFFCURVE",
+"359 93 OFFCURVE",
+"359 105 CURVE SMOOTH",
+"359 118 OFFCURVE",
+"368 130 OFFCURVE",
+"431 130 CURVE SMOOTH"
 );
 }
 );
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/mbivowelsinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/mbivowelsinh.glyph
index c0622f15..d6010054 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/mbivowelsinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/mbivowelsinh.glyph
@@ -84,18 +84,14 @@ nodes = (
 "697 -11 OFFCURVE",
 "791 107 OFFCURVE",
 "791 343 CURVE SMOOTH",
-"791 482 OFFCURVE",
-"747 576 OFFCURVE",
-"681 636 CURVE SMOOTH",
-"599 711 OFFCURVE",
-"496 735 OFFCURVE",
+"791 606 OFFCURVE",
+"638 735 OFFCURVE",
 "363 735 CURVE SMOOTH",
-"263 735 LINE SMOOTH",
-"197 735 OFFCURVE",
-"166 741 OFFCURVE",
-"147 757 CURVE SMOOTH",
-"131 771 OFFCURVE",
-"125 789 OFFCURVE",
+"330 735 OFFCURVE",
+"296 735 OFFCURVE",
+"263 735 CURVE SMOOTH",
+"190 735 OFFCURVE",
+"125 739 OFFCURVE",
 "125 812 CURVE SMOOTH",
 "125 900 OFFCURVE",
 "231 931 OFFCURVE",
@@ -116,18 +112,14 @@ nodes = (
 "172 957 OFFCURVE",
 "98 898 OFFCURVE",
 "98 811 CURVE SMOOTH",
-"98 784 OFFCURVE",
-"105 764 OFFCURVE",
-"118 749 CURVE SMOOTH",
-"144 718 OFFCURVE",
-"186 709 OFFCURVE",
+"98 728 OFFCURVE",
+"165 709 OFFCURVE",
 "258 709 CURVE SMOOTH",
-"356 709 LINE SMOOTH",
-"490 709 OFFCURVE",
-"589 685 OFFCURVE",
-"665 615 CURVE SMOOTH",
-"726 559 OFFCURVE",
-"764 468 OFFCURVE",
+"291 709 OFFCURVE",
+"323 709 OFFCURVE",
+"356 709 CURVE SMOOTH",
+"615 709 OFFCURVE",
+"764 601 OFFCURVE",
 "764 344 CURVE SMOOTH",
 "764 130 OFFCURVE",
 "686 15 OFFCURVE",
@@ -260,30 +252,26 @@ nodes = (
 "755 -10 OFFCURVE",
 "838 144 OFFCURVE",
 "838 347 CURVE SMOOTH",
-"838 474 OFFCURVE",
-"804 571 OFFCURVE",
-"737 638 CURVE SMOOTH",
-"663 710 OFFCURVE",
-"566 747 OFFCURVE",
+"838 627 OFFCURVE",
+"679 747 OFFCURVE",
 "393 747 CURVE SMOOTH",
-"280 747 LINE SMOOTH",
+"355 747 OFFCURVE",
+"318 747 OFFCURVE",
+"280 747 CURVE SMOOTH",
 "227 747 OFFCURVE",
-"198 751 OFFCURVE",
-"184 764 CURVE SMOOTH",
-"176 771 OFFCURVE",
-"171 783 OFFCURVE",
+"171 746 OFFCURVE",
 "171 799 CURVE SMOOTH",
 "171 858 OFFCURVE",
 "243 887 OFFCURVE",
 "425 887 CURVE SMOOTH",
 "657 887 OFFCURVE",
 "700 832 OFFCURVE",
-"700 769 CURVE SMOOTH",
+"700 770 CURVE SMOOTH",
 "700 737 OFFCURVE",
-"694 716 OFFCURVE",
-"685 698 CURVE",
-"752 677 LINE",
-"764 706 OFFCURVE",
+"674 686 OFFCURVE",
+"635 658 CURVE",
+"702 637 LINE",
+"744 676 OFFCURVE",
 "772 728 OFFCURVE",
 "772 770 CURVE SMOOTH",
 "772 861 OFFCURVE",
@@ -292,18 +280,14 @@ nodes = (
 "182 957 OFFCURVE",
 "99 891 OFFCURVE",
 "99 798 CURVE SMOOTH",
-"99 759 OFFCURVE",
-"112 732 OFFCURVE",
-"134 713 CURVE SMOOTH",
-"161 689 OFFCURVE",
-"199 677 OFFCURVE",
+"99 700 OFFCURVE",
+"175 677 OFFCURVE",
 "287 677 CURVE SMOOTH",
-"381 677 LINE SMOOTH",
-"538 677 OFFCURVE",
-"618 651 OFFCURVE",
-"680 593 CURVE SMOOTH",
-"736 540 OFFCURVE",
-"764 460 OFFCURVE",
+"318 677 OFFCURVE",
+"350 677 OFFCURVE",
+"381 677 CURVE SMOOTH",
+"632 677 OFFCURVE",
+"764 596 OFFCURVE",
 "764 349 CURVE SMOOTH",
 "764 177 OFFCURVE",
 "703 57 OFFCURVE",
@@ -360,6 +344,10 @@ paths = (
 {
 closed = 1;
 nodes = (
+"318 -17 OFFCURVE",
+"355 -12 OFFCURVE",
+"396 -6 CURVE",
+"388 83 LINE",
 "354 83 OFFCURVE",
 "333 83 OFFCURVE",
 "275 83 CURVE",
@@ -423,51 +411,15 @@ nodes = (
 "20 284 CURVE SMOOTH",
 "20 97 OFFCURVE",
 "93 -17 OFFCURVE",
-"251 -17 CURVE SMOOTH",
-"318 -17 OFFCURVE",
-"355 -12 OFFCURVE",
-"396 -6 CURVE",
-"393 27 OFFCURVE",
-"388 76 OFFCURVE",
-"388 83 CURVE"
-);
-},
-{
-closed = 1;
-nodes = (
-"483 130 OFFCURVE",
-"492 122 OFFCURVE",
-"492 105 CURVE SMOOTH",
-"492 91 OFFCURVE",
-"474 82 OFFCURVE",
-"454 82 CURVE",
-"450 -7 LINE",
-"548 67 LINE",
-"600 85 OFFCURVE",
-"618 108 OFFCURVE",
-"618 142 CURVE SMOOTH",
-"618 207 OFFCURVE",
-"554 223 OFFCURVE",
-"430 223 CURVE SMOOTH",
-"313 223 OFFCURVE",
-"241 213 OFFCURVE",
-"241 142 CURVE SMOOTH",
-"241 112 OFFCURVE",
-"264 83 OFFCURVE",
-"309 67 CURVE",
-"396 -7 LINE",
-"388 83 LINE",
-"367 83 OFFCURVE",
-"359 93 OFFCURVE",
-"359 105 CURVE SMOOTH",
-"359 118 OFFCURVE",
-"368 130 OFFCURVE",
-"431 130 CURVE SMOOTH"
+"251 -17 CURVE SMOOTH"
 );
 },
 {
 closed = 1;
 nodes = (
+"768 -17 OFFCURVE",
+"891 95 OFFCURVE",
+"891 358 CURVE SMOOTH",
 "891 622 OFFCURVE",
 "744 775 OFFCURVE",
 "438 775 CURVE SMOOTH",
@@ -508,18 +460,47 @@ nodes = (
 "744 223 OFFCURVE",
 "693 75 OFFCURVE",
 "591 91 CURVE",
-"540 91 OFFCURVE",
+"540 86 OFFCURVE",
 "485 82 OFFCURVE",
 "454 82 CURVE",
-"454 62 OFFCURVE",
-"450 18 OFFCURVE",
-"450 -7 CURVE",
+"450 -7 LINE",
 "497 -12 OFFCURVE",
 "560 -17 OFFCURVE",
-"609 -17 CURVE SMOOTH",
-"768 -17 OFFCURVE",
-"891 95 OFFCURVE",
-"891 358 CURVE SMOOTH"
+"609 -17 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"483 130 OFFCURVE",
+"492 122 OFFCURVE",
+"492 105 CURVE SMOOTH",
+"492 91 OFFCURVE",
+"474 82 OFFCURVE",
+"454 82 CURVE",
+"450 -7 LINE",
+"548 67 LINE",
+"600 85 OFFCURVE",
+"618 108 OFFCURVE",
+"618 142 CURVE SMOOTH",
+"618 206 OFFCURVE",
+"556 222 OFFCURVE",
+"437 223 CURVE",
+"430 223 LINE",
+"313 223 OFFCURVE",
+"241 213 OFFCURVE",
+"241 142 CURVE SMOOTH",
+"241 112 OFFCURVE",
+"264 83 OFFCURVE",
+"309 67 CURVE",
+"396 -7 LINE",
+"388 83 LINE",
+"367 83 OFFCURVE",
+"359 93 OFFCURVE",
+"359 105 CURVE SMOOTH",
+"359 118 OFFCURVE",
+"368 130 OFFCURVE",
+"431 130 CURVE SMOOTH"
 );
 }
 );
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/miivowelsinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/miivowelsinh.glyph
index 54c2541b..2046e3a2 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/miivowelsinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/miivowelsinh.glyph
@@ -11,21 +11,17 @@ nodes = (
 "664 -11 OFFCURVE",
 "757 187 OFFCURVE",
 "757 371 CURVE SMOOTH",
-"757 492 OFFCURVE",
-"726 580 OFFCURVE",
-"668 636 CURVE SMOOTH",
-"647 657 OFFCURVE",
-"616 679 OFFCURVE",
+"757 517 OFFCURVE",
+"710 645 OFFCURVE",
 "574 694 CURVE",
 "512 725 OFFCURVE",
 "438 735 OFFCURVE",
 "342 735 CURVE SMOOTH",
-"248 735 LINE SMOOTH",
-"182 735 OFFCURVE",
-"151 741 OFFCURVE",
-"132 757 CURVE SMOOTH",
-"116 771 OFFCURVE",
-"110 789 OFFCURVE",
+"311 735 OFFCURVE",
+"279 735 OFFCURVE",
+"248 735 CURVE SMOOTH",
+"175 735 OFFCURVE",
+"110 739 OFFCURVE",
 "110 812 CURVE SMOOTH",
 "110 900 OFFCURVE",
 "216 931 OFFCURVE",
@@ -61,18 +57,14 @@ nodes = (
 "158 957 OFFCURVE",
 "83 898 OFFCURVE",
 "83 811 CURVE SMOOTH",
-"83 784 OFFCURVE",
-"90 764 OFFCURVE",
-"103 749 CURVE SMOOTH",
-"129 718 OFFCURVE",
-"171 709 OFFCURVE",
+"83 728 OFFCURVE",
+"150 709 OFFCURVE",
 "243 709 CURVE SMOOTH",
-"338 709 LINE SMOOTH",
-"485 709 OFFCURVE",
-"587 682 OFFCURVE",
-"652 615 CURVE SMOOTH",
-"704 561 OFFCURVE",
-"730 482 OFFCURVE",
+"275 709 OFFCURVE",
+"306 709 OFFCURVE",
+"338 709 CURVE SMOOTH",
+"593 709 OFFCURVE",
+"730 625 OFFCURVE",
 "730 370 CURVE SMOOTH",
 "730 202 OFFCURVE",
 "646 15 OFFCURVE",
@@ -152,21 +144,17 @@ nodes = (
 "690 -11 OFFCURVE",
 "811 166 OFFCURVE",
 "811 374 CURVE SMOOTH",
-"811 489 OFFCURVE",
-"774 581 OFFCURVE",
-"716 638 CURVE SMOOTH",
-"684 668 OFFCURVE",
-"650 690 OFFCURVE",
-"606 708 CURVE",
-"543 735 OFFCURVE",
-"474 747 OFFCURVE",
+"811 550 OFFCURVE",
+"733 658 OFFCURVE",
+"601 710 CURVE",
+"537 735 OFFCURVE",
+"459 747 OFFCURVE",
 "372 747 CURVE SMOOTH",
-"265 747 LINE SMOOTH",
-"212 747 OFFCURVE",
-"185 751 OFFCURVE",
-"171 764 CURVE SMOOTH",
-"162 771 OFFCURVE",
-"157 783 OFFCURVE",
+"336 747 OFFCURVE",
+"301 747 OFFCURVE",
+"265 747 CURVE SMOOTH",
+"213 747 OFFCURVE",
+"157 747 OFFCURVE",
 "157 799 CURVE SMOOTH",
 "157 858 OFFCURVE",
 "228 887 OFFCURVE",
@@ -202,18 +190,14 @@ nodes = (
 "166 957 OFFCURVE",
 "85 891 OFFCURVE",
 "85 799 CURVE SMOOTH",
-"85 759 OFFCURVE",
-"98 733 OFFCURVE",
-"120 714 CURVE SMOOTH",
-"148 689 OFFCURVE",
-"185 677 OFFCURVE",
+"85 701 OFFCURVE",
+"162 677 OFFCURVE",
 "273 677 CURVE SMOOTH",
-"356 677 LINE SMOOTH",
-"516 677 OFFCURVE",
-"599 659 OFFCURVE",
-"668 580 CURVE SMOOTH",
-"710 532 OFFCURVE",
-"736 465 OFFCURVE",
+"301 677 OFFCURVE",
+"328 677 OFFCURVE",
+"356 677 CURVE SMOOTH",
+"590 677 OFFCURVE",
+"736 599 OFFCURVE",
 "736 375 CURVE SMOOTH",
 "736 217 OFFCURVE",
 "653 60 OFFCURVE",
@@ -290,6 +274,24 @@ paths = (
 {
 closed = 1;
 nodes = (
+"755 -11 OFFCURVE",
+"876 172 OFFCURVE",
+"876 412 CURVE SMOOTH",
+"876 596 OFFCURVE",
+"787 708 OFFCURVE",
+"640 740 CURVE",
+"596 768 OFFCURVE",
+"510 784 OFFCURVE",
+"429 784 CURVE SMOOTH",
+"312 784 OFFCURVE",
+"275 769 OFFCURVE",
+"245 769 CURVE SMOOTH",
+"224 769 OFFCURVE",
+"214 780 OFFCURVE",
+"214 798 CURVE SMOOTH",
+"214 839 OFFCURVE",
+"256 852 OFFCURVE",
+"436 852 CURVE SMOOTH",
 "504 852 OFFCURVE",
 "562 847 OFFCURVE",
 "608 835 CURVE",
@@ -393,25 +395,7 @@ nodes = (
 "20 341 CURVE SMOOTH",
 "20 117 OFFCURVE",
 "172 -11 OFFCURVE",
-"429 -11 CURVE SMOOTH",
-"755 -11 OFFCURVE",
-"876 172 OFFCURVE",
-"876 412 CURVE SMOOTH",
-"876 596 OFFCURVE",
-"787 708 OFFCURVE",
-"640 740 CURVE",
-"596 768 OFFCURVE",
-"510 784 OFFCURVE",
-"429 784 CURVE SMOOTH",
-"312 784 OFFCURVE",
-"275 769 OFFCURVE",
-"245 769 CURVE SMOOTH",
-"224 769 OFFCURVE",
-"214 780 OFFCURVE",
-"214 798 CURVE SMOOTH",
-"214 839 OFFCURVE",
-"256 852 OFFCURVE",
-"436 852 CURVE SMOOTH"
+"429 -11 CURVE SMOOTH"
 );
 }
 );
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/mivowelsinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/mivowelsinh.glyph
index 47e33bd7..0751cd0f 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/mivowelsinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/mivowelsinh.glyph
@@ -8,122 +8,114 @@ paths = (
 {
 closed = 1;
 nodes = (
-"667 -11 OFFCURVE",
-"760 187 OFFCURVE",
-"760 371 CURVE SMOOTH",
-"760 492 OFFCURVE",
-"730 579 OFFCURVE",
-"671 637 CURVE SMOOTH",
-"602 705 OFFCURVE",
-"495 735 OFFCURVE",
-"345 735 CURVE SMOOTH",
-"251 735 LINE SMOOTH",
-"185 735 OFFCURVE",
-"154 741 OFFCURVE",
-"135 757 CURVE SMOOTH",
-"119 771 OFFCURVE",
-"113 789 OFFCURVE",
-"113 812 CURVE SMOOTH",
-"113 900 OFFCURVE",
-"219 931 OFFCURVE",
-"382 931 CURVE SMOOTH",
-"606 931 OFFCURVE",
-"687 875 OFFCURVE",
-"687 783 CURVE SMOOTH",
-"687 747 OFFCURVE",
-"677 717 OFFCURVE",
-"658 685 CURVE",
-"683 674 LINE",
-"702 709 OFFCURVE",
-"714 743 OFFCURVE",
-"714 782 CURVE SMOOTH",
-"714 867 OFFCURVE",
-"661 957 OFFCURVE",
-"382 957 CURVE SMOOTH",
-"161 957 OFFCURVE",
-"86 898 OFFCURVE",
-"86 811 CURVE SMOOTH",
-"86 784 OFFCURVE",
-"93 764 OFFCURVE",
-"106 749 CURVE SMOOTH",
-"132 718 OFFCURVE",
-"174 709 OFFCURVE",
-"246 709 CURVE SMOOTH",
-"341 709 LINE SMOOTH",
-"488 709 OFFCURVE",
-"590 682 OFFCURVE",
-"655 615 CURVE SMOOTH",
-"707 561 OFFCURVE",
-"733 482 OFFCURVE",
-"733 370 CURVE SMOOTH",
-"733 202 OFFCURVE",
-"649 15 OFFCURVE",
-"379 15 CURVE SMOOTH",
-"171 15 OFFCURVE",
-"71 137 OFFCURVE",
-"71 332 CURVE SMOOTH",
-"71 473 OFFCURVE",
-"132 550 OFFCURVE",
-"193 550 CURVE SMOOTH",
-"232 550 OFFCURVE",
-"236 526 OFFCURVE",
-"236 497 CURVE SMOOTH",
-"236 476 OFFCURVE",
-"228 436 OFFCURVE",
-"228 393 CURVE SMOOTH",
-"228 322 OFFCURVE",
-"267 254 OFFCURVE",
-"381 254 CURVE SMOOTH",
-"487 254 OFFCURVE",
-"560 311 OFFCURVE",
-"560 426 CURVE SMOOTH",
-"560 528 OFFCURVE",
-"501 576 OFFCURVE",
-"434 576 CURVE SMOOTH",
-"358 576 OFFCURVE",
-"324 527 OFFCURVE",
-"324 477 CURVE SMOOTH",
-"324 417 OFFCURVE",
-"361 379 OFFCURVE",
-"426 379 CURVE SMOOTH",
-"482 379 OFFCURVE",
-"511 399 OFFCURVE",
-"550 433 CURVE",
-"538 452 LINE",
-"502 420 OFFCURVE",
-"473 405 OFFCURVE",
-"427 405 CURVE SMOOTH",
-"381 405 OFFCURVE",
-"351 428 OFFCURVE",
-"351 476 CURVE SMOOTH",
-"351 520 OFFCURVE",
-"379 550 OFFCURVE",
-"435 550 CURVE SMOOTH",
-"491 550 OFFCURVE",
-"534 506 OFFCURVE",
-"534 426 CURVE SMOOTH",
-"534 319 OFFCURVE",
-"464 280 OFFCURVE",
-"381 280 CURVE SMOOTH",
-"287 280 OFFCURVE",
-"254 332 OFFCURVE",
-"254 395 CURVE SMOOTH",
-"254 443 OFFCURVE",
-"263 478 OFFCURVE",
-"263 508 CURVE SMOOTH",
-"263 539 OFFCURVE",
-"247 576 OFFCURVE",
-"196 576 CURVE SMOOTH",
-"112 576 OFFCURVE",
-"44 484 OFFCURVE",
-"44 332 CURVE SMOOTH",
-"44 125 OFFCURVE",
-"154 -11 OFFCURVE",
-"378 -11 CURVE SMOOTH"
+"664 -11 OFFCURVE",
+"757 187 OFFCURVE",
+"757 371 CURVE SMOOTH",
+"757 635 OFFCURVE",
+"614 735 OFFCURVE",
+"342 735 CURVE SMOOTH",
+"311 735 OFFCURVE",
+"279 735 OFFCURVE",
+"248 735 CURVE SMOOTH",
+"175 735 OFFCURVE",
+"110 739 OFFCURVE",
+"110 812 CURVE SMOOTH",
+"110 900 OFFCURVE",
+"216 931 OFFCURVE",
+"379 931 CURVE SMOOTH",
+"603 931 OFFCURVE",
+"684 875 OFFCURVE",
+"684 783 CURVE SMOOTH",
+"684 747 OFFCURVE",
+"664 687 OFFCURVE",
+"605 655 CURVE",
+"630 644 LINE",
+"689 679 OFFCURVE",
+"711 743 OFFCURVE",
+"711 782 CURVE SMOOTH",
+"711 867 OFFCURVE",
+"658 957 OFFCURVE",
+"379 957 CURVE SMOOTH",
+"158 957 OFFCURVE",
+"83 898 OFFCURVE",
+"83 811 CURVE SMOOTH",
+"83 728 OFFCURVE",
+"150 709 OFFCURVE",
+"243 709 CURVE SMOOTH",
+"275 709 OFFCURVE",
+"306 709 OFFCURVE",
+"338 709 CURVE SMOOTH",
+"593 709 OFFCURVE",
+"730 625 OFFCURVE",
+"730 370 CURVE SMOOTH",
+"730 202 OFFCURVE",
+"646 15 OFFCURVE",
+"376 15 CURVE SMOOTH",
+"168 15 OFFCURVE",
+"68 137 OFFCURVE",
+"68 332 CURVE SMOOTH",
+"68 473 OFFCURVE",
+"129 550 OFFCURVE",
+"190 550 CURVE SMOOTH",
+"229 550 OFFCURVE",
+"233 526 OFFCURVE",
+"233 497 CURVE SMOOTH",
+"233 476 OFFCURVE",
+"225 436 OFFCURVE",
+"225 393 CURVE SMOOTH",
+"225 322 OFFCURVE",
+"264 254 OFFCURVE",
+"378 254 CURVE SMOOTH",
+"484 254 OFFCURVE",
+"557 311 OFFCURVE",
+"557 426 CURVE SMOOTH",
+"557 528 OFFCURVE",
+"498 576 OFFCURVE",
+"431 576 CURVE SMOOTH",
+"355 576 OFFCURVE",
+"321 527 OFFCURVE",
+"321 477 CURVE SMOOTH",
+"321 417 OFFCURVE",
+"358 379 OFFCURVE",
+"423 379 CURVE SMOOTH",
+"479 379 OFFCURVE",
+"506 393 OFFCURVE",
+"547 433 CURVE",
+"535 452 LINE",
+"499 420 OFFCURVE",
+"470 405 OFFCURVE",
+"424 405 CURVE SMOOTH",
+"378 405 OFFCURVE",
+"348 428 OFFCURVE",
+"348 476 CURVE SMOOTH",
+"348 520 OFFCURVE",
+"376 550 OFFCURVE",
+"432 550 CURVE SMOOTH",
+"488 550 OFFCURVE",
+"531 506 OFFCURVE",
+"531 426 CURVE SMOOTH",
+"531 319 OFFCURVE",
+"461 280 OFFCURVE",
+"378 280 CURVE SMOOTH",
+"284 280 OFFCURVE",
+"251 332 OFFCURVE",
+"251 395 CURVE SMOOTH",
+"251 443 OFFCURVE",
+"260 478 OFFCURVE",
+"260 508 CURVE SMOOTH",
+"260 539 OFFCURVE",
+"244 576 OFFCURVE",
+"193 576 CURVE SMOOTH",
+"109 576 OFFCURVE",
+"41 484 OFFCURVE",
+"41 332 CURVE SMOOTH",
+"41 125 OFFCURVE",
+"151 -11 OFFCURVE",
+"375 -11 CURVE SMOOTH"
 );
 }
 );
-width = 801;
+width = 798;
 },
 {
 layerId = UUID0;
@@ -131,122 +123,114 @@ paths = (
 {
 closed = 1;
 nodes = (
-"693 -11 OFFCURVE",
-"814 166 OFFCURVE",
-"814 374 CURVE SMOOTH",
-"814 489 OFFCURVE",
-"777 581 OFFCURVE",
-"719 639 CURVE SMOOTH",
-"642 716 OFFCURVE",
-"545 747 OFFCURVE",
-"375 747 CURVE SMOOTH",
-"268 747 LINE SMOOTH",
-"215 747 OFFCURVE",
-"188 751 OFFCURVE",
-"174 764 CURVE SMOOTH",
-"165 771 OFFCURVE",
-"160 783 OFFCURVE",
-"160 799 CURVE SMOOTH",
-"160 858 OFFCURVE",
-"231 887 OFFCURVE",
-"405 887 CURVE SMOOTH",
-"630 887 OFFCURVE",
-"679 832 OFFCURVE",
-"679 769 CURVE SMOOTH",
-"679 737 OFFCURVE",
-"673 716 OFFCURVE",
-"665 698 CURVE",
-"731 677 LINE",
-"743 706 OFFCURVE",
-"751 728 OFFCURVE",
-"751 770 CURVE SMOOTH",
-"751 860 OFFCURVE",
-"694 957 OFFCURVE",
-"404 957 CURVE SMOOTH",
-"169 957 OFFCURVE",
-"88 891 OFFCURVE",
-"88 799 CURVE SMOOTH",
-"88 759 OFFCURVE",
-"101 733 OFFCURVE",
-"123 714 CURVE SMOOTH",
-"151 689 OFFCURVE",
-"188 677 OFFCURVE",
-"276 677 CURVE SMOOTH",
-"359 677 LINE SMOOTH",
-"519 677 OFFCURVE",
-"602 659 OFFCURVE",
-"671 580 CURVE SMOOTH",
-"713 532 OFFCURVE",
-"739 465 OFFCURVE",
-"739 375 CURVE SMOOTH",
-"739 217 OFFCURVE",
-"656 60 OFFCURVE",
-"402 60 CURVE SMOOTH",
-"217 60 OFFCURVE",
-"111 158 OFFCURVE",
-"111 335 CURVE SMOOTH",
-"111 444 OFFCURVE",
-"151 510 OFFCURVE",
-"204 510 CURVE SMOOTH",
-"228 510 OFFCURVE",
-"232 493 OFFCURVE",
-"232 475 CURVE SMOOTH",
-"232 450 OFFCURVE",
-"223 421 OFFCURVE",
-"223 382 CURVE SMOOTH",
-"223 301 OFFCURVE",
-"271 229 OFFCURVE",
-"407 229 CURVE SMOOTH",
-"528 229 OFFCURVE",
-"605 301 OFFCURVE",
-"605 413 CURVE SMOOTH",
-"605 534 OFFCURVE",
-"530 576 OFFCURVE",
-"461 576 CURVE SMOOTH",
-"369 576 OFFCURVE",
-"330 521 OFFCURVE",
-"330 464 CURVE SMOOTH",
-"330 398 OFFCURVE",
-"372 354 OFFCURVE",
-"445 354 CURVE SMOOTH",
-"509 354 OFFCURVE",
-"542 381 OFFCURVE",
-"574 410 CURVE",
-"561 455 LINE",
-"525 427 OFFCURVE",
-"498 416 OFFCURVE",
-"456 416 CURVE SMOOTH",
-"421 416 OFFCURVE",
-"400 434 OFFCURVE",
-"400 464 CURVE SMOOTH",
-"400 496 OFFCURVE",
-"422 512 OFFCURVE",
-"459 512 CURVE SMOOTH",
-"507 512 OFFCURVE",
-"537 475 OFFCURVE",
-"537 414 CURVE SMOOTH",
-"537 330 OFFCURVE",
-"483 294 OFFCURVE",
-"406 294 CURVE SMOOTH",
-"323 294 OFFCURVE",
-"293 333 OFFCURVE",
-"293 385 CURVE SMOOTH",
-"293 432 OFFCURVE",
-"304 461 OFFCURVE",
-"304 498 CURVE SMOOTH",
-"304 530 OFFCURVE",
-"286 576 OFFCURVE",
-"218 576 CURVE SMOOTH",
-"116 576 OFFCURVE",
-"39 488 OFFCURVE",
-"39 329 CURVE SMOOTH",
-"39 129 OFFCURVE",
-"161 -11 OFFCURVE",
-"400 -11 CURVE SMOOTH"
+"690 -11 OFFCURVE",
+"811 166 OFFCURVE",
+"811 374 CURVE SMOOTH",
+"811 635 OFFCURVE",
+"645 747 OFFCURVE",
+"372 747 CURVE SMOOTH",
+"336 747 OFFCURVE",
+"301 747 OFFCURVE",
+"265 747 CURVE SMOOTH",
+"213 747 OFFCURVE",
+"157 747 OFFCURVE",
+"157 799 CURVE SMOOTH",
+"157 858 OFFCURVE",
+"228 887 OFFCURVE",
+"402 887 CURVE SMOOTH",
+"627 887 OFFCURVE",
+"676 832 OFFCURVE",
+"676 769 CURVE SMOOTH",
+"676 737 OFFCURVE",
+"670 716 OFFCURVE",
+"662 698 CURVE",
+"728 677 LINE",
+"740 706 OFFCURVE",
+"748 728 OFFCURVE",
+"748 770 CURVE SMOOTH",
+"748 860 OFFCURVE",
+"691 957 OFFCURVE",
+"401 957 CURVE SMOOTH",
+"166 957 OFFCURVE",
+"85 891 OFFCURVE",
+"85 799 CURVE SMOOTH",
+"85 701 OFFCURVE",
+"162 677 OFFCURVE",
+"273 677 CURVE SMOOTH",
+"301 677 OFFCURVE",
+"328 677 OFFCURVE",
+"356 677 CURVE SMOOTH",
+"590 677 OFFCURVE",
+"736 599 OFFCURVE",
+"736 375 CURVE SMOOTH",
+"736 217 OFFCURVE",
+"653 60 OFFCURVE",
+"399 60 CURVE SMOOTH",
+"214 60 OFFCURVE",
+"108 158 OFFCURVE",
+"108 335 CURVE SMOOTH",
+"108 444 OFFCURVE",
+"148 510 OFFCURVE",
+"201 510 CURVE SMOOTH",
+"225 510 OFFCURVE",
+"229 493 OFFCURVE",
+"229 475 CURVE SMOOTH",
+"229 450 OFFCURVE",
+"220 421 OFFCURVE",
+"220 382 CURVE SMOOTH",
+"220 301 OFFCURVE",
+"268 229 OFFCURVE",
+"404 229 CURVE SMOOTH",
+"525 229 OFFCURVE",
+"602 301 OFFCURVE",
+"602 413 CURVE SMOOTH",
+"602 534 OFFCURVE",
+"527 576 OFFCURVE",
+"458 576 CURVE SMOOTH",
+"366 576 OFFCURVE",
+"327 521 OFFCURVE",
+"327 464 CURVE SMOOTH",
+"327 398 OFFCURVE",
+"369 354 OFFCURVE",
+"442 354 CURVE SMOOTH",
+"506 354 OFFCURVE",
+"539 381 OFFCURVE",
+"571 410 CURVE",
+"558 455 LINE",
+"522 427 OFFCURVE",
+"495 416 OFFCURVE",
+"453 416 CURVE SMOOTH",
+"418 416 OFFCURVE",
+"397 434 OFFCURVE",
+"397 464 CURVE SMOOTH",
+"397 496 OFFCURVE",
+"419 512 OFFCURVE",
+"456 512 CURVE SMOOTH",
+"504 512 OFFCURVE",
+"534 475 OFFCURVE",
+"534 414 CURVE SMOOTH",
+"534 330 OFFCURVE",
+"480 294 OFFCURVE",
+"403 294 CURVE SMOOTH",
+"320 294 OFFCURVE",
+"290 333 OFFCURVE",
+"290 385 CURVE SMOOTH",
+"290 432 OFFCURVE",
+"301 461 OFFCURVE",
+"301 498 CURVE SMOOTH",
+"301 530 OFFCURVE",
+"283 576 OFFCURVE",
+"215 576 CURVE SMOOTH",
+"113 576 OFFCURVE",
+"36 488 OFFCURVE",
+"36 329 CURVE SMOOTH",
+"36 129 OFFCURVE",
+"158 -11 OFFCURVE",
+"397 -11 CURVE SMOOTH"
 );
 }
 );
-width = 850;
+width = 847;
 },
 {
 layerId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
@@ -254,6 +238,9 @@ paths = (
 {
 closed = 1;
 nodes = (
+"755 -11 OFFCURVE",
+"876 172 OFFCURVE",
+"876 412 CURVE SMOOTH",
 "876 676 OFFCURVE",
 "697 784 OFFCURVE",
 "429 784 CURVE SMOOTH",
@@ -354,10 +341,7 @@ nodes = (
 "20 341 CURVE SMOOTH",
 "20 117 OFFCURVE",
 "172 -11 OFFCURVE",
-"429 -11 CURVE SMOOTH",
-"755 -11 OFFCURVE",
-"876 172 OFFCURVE",
-"876 412 CURVE SMOOTH"
+"429 -11 CURVE SMOOTH"
 );
 }
 );
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/nathasinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/nathasinh.glyph
index b4da73e4..fa428743 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/nathasinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/nathasinh.glyph
@@ -3,6 +3,12 @@ color = 11;
 glyphname = nathasinh;
 layers = (
 {
+anchors = (
+{
+name = repaya;
+position = "{733.14, 750}";
+}
+);
 layerId = "7977A986-4EFB-4152-84F8-5A02CD382AAF";
 paths = (
 {
@@ -319,6 +325,12 @@ nodes = (
 width = 1333;
 },
 {
+anchors = (
+{
+name = repaya;
+position = "{785.465, 750}";
+}
+);
 layerId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
 paths = (
 {
@@ -474,6 +486,12 @@ nodes = (
 width = 1351;
 },
 {
+anchors = (
+{
+name = repaya;
+position = "{533.721, 750}";
+}
+);
 layerId = "CF8E177F-0CDC-40C1-8828-F158AA64F32E";
 paths = (
 {
@@ -629,6 +647,12 @@ nodes = (
 width = 918;
 },
 {
+anchors = (
+{
+name = repaya;
+position = "{562.791, 750}";
+}
+);
 layerId = "56AEB5FB-BA14-4784-B08F-18006463EEDB";
 paths = (
 {
@@ -784,6 +808,12 @@ nodes = (
 width = 968;
 },
 {
+anchors = (
+{
+name = repaya;
+position = "{597.093, 750}";
+}
+);
 layerId = "DC607D84-584B-45E6-A9EB-D1AF471CA2AE";
 paths = (
 {
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/nnddiivowelsinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/nnddiivowelsinh.glyph
index 9f3ca067..5353cbf4 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/nnddiivowelsinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/nnddiivowelsinh.glyph
@@ -3,480 +3,97 @@ color = 3;
 glyphname = nnddiivowelsinh;
 layers = (
 {
-layerId = "7977A986-4EFB-4152-84F8-5A02CD382AAF";
-paths = (
+components = (
 {
-closed = 1;
-nodes = (
-"779 -11 OFFCURVE",
-"866 77 OFFCURVE",
-"866 328 CURVE SMOOTH",
-"866 476 OFFCURVE",
-"832 577 OFFCURVE",
-"763 641 CURVE SMOOTH",
-"740 663 OFFCURVE",
-"712 680 OFFCURVE",
-"682 693 CURVE",
-"620 724 OFFCURVE",
-"544 735 OFFCURVE",
-"441 735 CURVE SMOOTH",
-"370 735 LINE SMOOTH",
-"304 735 OFFCURVE",
-"273 741 OFFCURVE",
-"254 757 CURVE SMOOTH",
-"238 771 OFFCURVE",
-"232 789 OFFCURVE",
-"232 812 CURVE SMOOTH",
-"232 900 OFFCURVE",
-"338 931 OFFCURVE",
-"496 931 CURVE SMOOTH",
-"591 931 OFFCURVE",
-"669 921 OFFCURVE",
-"724 894 CURVE",
-"772 872 OFFCURVE",
-"802 835 OFFCURVE",
-"802 780 CURVE SMOOTH",
-"802 732 OFFCURVE",
-"777 708 OFFCURVE",
-"731 708 CURVE SMOOTH",
-"690 708 OFFCURVE",
-"656 728 OFFCURVE",
-"656 778 CURVE SMOOTH",
-"656 833 OFFCURVE",
-"693 866 OFFCURVE",
-"744 891 CURVE",
-"722 905 LINE",
-"665 874 OFFCURVE",
-"629 836 OFFCURVE",
-"629 778 CURVE SMOOTH",
-"629 715 OFFCURVE",
-"677 682 OFFCURVE",
-"732 682 CURVE SMOOTH",
-"794 682 OFFCURVE",
-"829 717 OFFCURVE",
-"829 780 CURVE SMOOTH",
-"829 882 OFFCURVE",
-"735 957 OFFCURVE",
-"496 957 CURVE SMOOTH",
-"283 957 OFFCURVE",
-"205 898 OFFCURVE",
-"205 811 CURVE SMOOTH",
-"205 784 OFFCURVE",
-"212 764 OFFCURVE",
-"225 749 CURVE SMOOTH",
-"251 718 OFFCURVE",
-"293 709 OFFCURVE",
-"365 709 CURVE SMOOTH",
-"427 709 LINE SMOOTH",
-"588 709 OFFCURVE",
-"677 685 OFFCURVE",
-"744 622 CURVE SMOOTH",
-"808 562 OFFCURVE",
-"839 468 OFFCURVE",
-"839 326 CURVE SMOOTH",
-"839 95 OFFCURVE",
-"767 15 OFFCURVE",
-"654 15 CURVE SMOOTH",
-"537 15 OFFCURVE",
-"505 117 OFFCURVE",
-"505 171 CURVE SMOOTH",
-"505 204 LINE",
-"479 204 LINE",
-"479 170 LINE SMOOTH",
-"479 109 OFFCURVE",
-"443 15 OFFCURVE",
-"332 15 CURVE SMOOTH",
-"245 15 OFFCURVE",
-"179 71 OFFCURVE",
-"179 203 CURVE SMOOTH",
-"179 266 OFFCURVE",
-"198 313 OFFCURVE",
-"230 348 CURVE SMOOTH",
-"281 404 OFFCURVE",
-"368 429 OFFCURVE",
-"467 429 CURVE SMOOTH",
-"492 429 LINE",
-"492 446 LINE SMOOTH",
-"492 544 OFFCURVE",
-"438 612 OFFCURVE",
-"341 612 CURVE SMOOTH",
-"264 612 OFFCURVE",
-"214 566 OFFCURVE",
-"214 498 CURVE SMOOTH",
-"214 493 OFFCURVE",
-"214 485 OFFCURVE",
-"215 476 CURVE",
-"242 478 LINE",
-"241 484 OFFCURVE",
-"241 490 OFFCURVE",
-"241 495 CURVE SMOOTH",
-"241 557 OFFCURVE",
-"278 586 OFFCURVE",
-"343 586 CURVE SMOOTH",
-"413 586 OFFCURVE",
-"461 541 OFFCURVE",
-"466 455 CURVE",
-"139 455 LINE",
-"139 429 LINE",
-"230 429 LINE SMOOTH",
-"281 429 OFFCURVE",
-"324 432 OFFCURVE",
-"370 436 CURVE SMOOTH",
-"364 436 LINE",
-"209 412 OFFCURVE",
-"152 315 OFFCURVE",
-"152 203 CURVE SMOOTH",
-"152 65 OFFCURVE",
-"221 -11 OFFCURVE",
-"333 -11 CURVE SMOOTH",
-"423 -11 OFFCURVE",
-"471 39 OFFCURVE",
-"492 109 CURVE",
-"510 39 OFFCURVE",
-"565 -11 OFFCURVE",
-"655 -11 CURVE SMOOTH"
+name = ddiivowelsinh;
+transform = "{1, 0, 0, 1, 140, 0}";
+}
 );
-},
+layerId = "7977A986-4EFB-4152-84F8-5A02CD382AAF";
+paths = (
 {
 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",
-"324 587 CURVE SMOOTH",
-"352 587 OFFCURVE",
-"364 587 OFFCURVE",
-"377 586 CURVE",
-"394 604 LINE",
-"374 609 OFFCURVE",
-"355 612 OFFCURVE",
-"327 612 CURVE SMOOTH",
-"162 612 OFFCURVE",
-"41 512 OFFCURVE",
-"41 328 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 473 OFFCURVE",
+"234 588 OFFCURVE",
+"361 588 CURVE",
+"360 610 LINE",
+"217 610 OFFCURVE",
+"41 487 OFFCURVE",
+"41 256 CURVE SMOOTH"
 );
 }
 );
-width = 907;
+width = 938;
 },
 {
-layerId = UUID0;
-paths = (
+components = (
 {
-closed = 1;
-nodes = (
-"859 -11 OFFCURVE",
-"959 79 OFFCURVE",
-"959 323 CURVE SMOOTH",
-"959 458 OFFCURVE",
-"930 557 OFFCURVE",
-"872 624 CURVE SMOOTH",
-"841 659 OFFCURVE",
-"803 684 OFFCURVE",
-"758 703 CURVE SMOOTH",
-"685 735 OFFCURVE",
-"621 747 OFFCURVE",
-"527 747 CURVE SMOOTH",
-"420 747 LINE SMOOTH",
-"367 747 OFFCURVE",
-"339 751 OFFCURVE",
-"325 764 CURVE SMOOTH",
-"317 771 OFFCURVE",
-"311 783 OFFCURVE",
-"311 799 CURVE SMOOTH",
-"311 858 OFFCURVE",
-"384 887 OFFCURVE",
-"559 887 CURVE SMOOTH",
-"634 887 OFFCURVE",
-"679 881 OFFCURVE",
-"717 874 CURVE",
-"803 855 OFFCURVE",
-"841 817 OFFCURVE",
-"841 771 CURVE SMOOTH",
-"841 738 OFFCURVE",
-"824 720 OFFCURVE",
-"789 720 CURVE SMOOTH",
-"753 720 OFFCURVE",
-"730 741 OFFCURVE",
-"730 776 CURVE SMOOTH",
-"730 815 OFFCURVE",
-"754 845 OFFCURVE",
-"792 867 CURVE",
-"735 896 LINE",
-"702 871 OFFCURVE",
-"664 829 OFFCURVE",
-"664 774 CURVE SMOOTH",
-"664 703 OFFCURVE",
-"716 667 OFFCURVE",
-"791 667 CURVE SMOOTH",
-"871 667 OFFCURVE",
-"911 708 OFFCURVE",
-"911 775 CURVE SMOOTH",
-"911 873 OFFCURVE",
-"821 957 OFFCURVE",
-"554 957 CURVE SMOOTH",
-"323 957 OFFCURVE",
-"239 891 OFFCURVE",
-"239 798 CURVE SMOOTH",
-"239 759 OFFCURVE",
-"252 732 OFFCURVE",
-"274 713 CURVE SMOOTH",
-"302 688 OFFCURVE",
-"339 677 OFFCURVE",
-"427 677 CURVE SMOOTH",
-"503 677 LINE SMOOTH",
-"667 677 OFFCURVE",
-"746 649 OFFCURVE",
-"804 587 CURVE SMOOTH",
-"858 529 OFFCURVE",
-"884 441 OFFCURVE",
-"884 322 CURVE SMOOTH",
-"884 122 OFFCURVE",
-"811 60 OFFCURVE",
-"721 60 CURVE SMOOTH",
-"617 60 OFFCURVE",
-"587 122 OFFCURVE",
-"587 208 CURVE SMOOTH",
-"587 214 LINE",
-"520 214 LINE",
-"520 208 LINE SMOOTH",
-"520 119 OFFCURVE",
-"486 60 OFFCURVE",
-"386 60 CURVE SMOOTH",
-"304 60 OFFCURVE",
-"252 111 OFFCURVE",
-"252 204 CURVE SMOOTH",
-"252 268 OFFCURVE",
-"274 311 OFFCURVE",
-"309 340 CURVE SMOOTH",
-"368 389 OFFCURVE",
-"448 389 OFFCURVE",
-"518 389 CURVE SMOOTH",
-"568 389 LINE",
-"568 430 LINE SMOOTH",
-"568 549 OFFCURVE",
-"507 612 OFFCURVE",
-"399 612 CURVE SMOOTH",
-"309 612 OFFCURVE",
-"255 572 OFFCURVE",
-"255 496 CURVE SMOOTH",
-"255 490 OFFCURVE",
-"255 481 OFFCURVE",
-"256 474 CURVE",
-"329 478 LINE",
-"328 482 OFFCURVE",
-"328 486 OFFCURVE",
-"328 490 CURVE SMOOTH",
-"328 526 OFFCURVE",
-"354 546 OFFCURVE",
-"405 546 CURVE SMOOTH",
-"456 546 OFFCURVE",
-"492 517 OFFCURVE",
-"496 455 CURVE",
-"176 455 LINE",
-"176 389 LINE",
-"186 389 LINE SMOOTH",
-"225 389 OFFCURVE",
-"285 389 OFFCURVE",
-"323 397 CURVE",
-"321 406 LINE",
-"216 365 OFFCURVE",
-"179 287 OFFCURVE",
-"179 204 CURVE SMOOTH",
-"179 65 OFFCURVE",
-"265 -11 OFFCURVE",
-"384 -11 CURVE SMOOTH",
-"473 -11 OFFCURVE",
-"513 23 OFFCURVE",
-"554 77 CURVE",
-"589 29 OFFCURVE",
-"634 -11 OFFCURVE",
-"719 -11 CURVE SMOOTH"
+name = ddiivowelsinh;
+transform = "{1, 0, 0, 1, 190, 0}";
+}
 );
-},
+layerId = UUID0;
+paths = (
 {
 closed = 1;
 nodes = (
-"36 228 OFFCURVE",
-"63 140 OFFCURVE",
-"99 83 CURVE",
-"165 118 LINE",
-"126 172 OFFCURVE",
-"109 240 OFFCURVE",
-"109 312 CURVE SMOOTH",
-"109 460 OFFCURVE",
-"193 549 OFFCURVE",
-"348 549 CURVE SMOOTH",
-"358 549 OFFCURVE",
-"375 547 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"
+"36 158 OFFCURVE",
+"72 71 OFFCURVE",
+"119 0 CURVE",
+"185 34 LINE",
+"140 99 OFFCURVE",
+"109 180 OFFCURVE",
+"109 268 CURVE SMOOTH",
+"109 451 OFFCURVE",
+"223 558 OFFCURVE",
+"425 558 CURVE",
+"420 612 LINE",
+"195 612 OFFCURVE",
+"36 507 OFFCURVE",
+"36 263 CURVE SMOOTH"
 );
 }
 );
-width = 995;
+width = 1035;
 },
 {
-layerId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
-paths = (
+components = (
 {
-closed = 1;
-nodes = (
-"790 653 OFFCURVE",
-"938 562 OFFCURVE",
-"938 363 CURVE SMOOTH",
-"938 233 OFFCURVE",
-"897 137 OFFCURVE",
-"806 137 CURVE SMOOTH",
-"757 137 OFFCURVE",
-"721 172 OFFCURVE",
-"721 244 CURVE SMOOTH",
-"721 248 LINE",
-"587 248 LINE",
-"587 244 LINE SMOOTH",
-"587 176 OFFCURVE",
-"553 137 OFFCURVE",
-"497 137 CURVE SMOOTH",
-"431 137 OFFCURVE",
-"404 173 OFFCURVE",
-"404 226 CURVE SMOOTH",
-"404 306 OFFCURVE",
-"458 330 OFFCURVE",
-"532 330 CURVE SMOOTH",
-"652 330 LINE",
-"652 411 LINE SMOOTH",
-"652 536 OFFCURVE",
-"585 623 OFFCURVE",
-"455 622 CURVE SMOOTH",
-"347 621 OFFCURVE",
-"288 562 OFFCURVE",
-"288 490 CURVE SMOOTH",
-"288 489 OFFCURVE",
-"289 480 OFFCURVE",
-"289 475 CURVE",
-"330 475 OFFCURVE",
-"402 475 OFFCURVE",
-"429 475 CURVE",
-"429 487 OFFCURVE",
-"440 504 OFFCURVE",
-"469 504 CURVE SMOOTH",
-"498 504 OFFCURVE",
-"518 483 OFFCURVE",
-"515 444 CURVE",
-"218 444 LINE",
-"218 330 LINE",
-"246 330 LINE",
-"299 334 OFFCURVE",
-"349 339 OFFCURVE",
-"380 342 CURVE",
-"329 358 LINE",
-"281 326 OFFCURVE",
-"243 276 OFFCURVE",
-"243 192 CURVE SMOOTH",
-"243 69 OFFCURVE",
-"337 -11 OFFCURVE",
-"473 -11 CURVE SMOOTH",
-"565 -11 OFFCURVE",
-"632 38 OFFCURVE",
-"655 112 CURVE",
-"678 38 OFFCURVE",
-"749 -11 OFFCURVE",
-"835 -11 CURVE SMOOTH",
-"986 -11 OFFCURVE",
-"1099 86 OFFCURVE",
-"1099 350 CURVE SMOOTH",
-"1099 614 OFFCURVE",
-"926 775 OFFCURVE",
-"632 775 CURVE SMOOTH",
-"559 775 OFFCURVE",
-"523 769 OFFCURVE",
-"474 766 CURVE SMOOTH",
-"448 764 OFFCURVE",
-"431 774 OFFCURVE",
-"431 793 CURVE SMOOTH",
-"431 834 OFFCURVE",
-"473 852 OFFCURVE",
-"645 852 CURVE SMOOTH",
-"709 852 OFFCURVE",
-"768 843 OFFCURVE",
-"806 831 CURVE",
-"875 848 OFFCURVE",
-"911 824 OFFCURVE",
-"911 788 CURVE SMOOTH",
-"911 764 OFFCURVE",
-"896 740 OFFCURVE",
-"864 740 CURVE SMOOTH",
-"833 740 OFFCURVE",
-"816 760 OFFCURVE",
-"816 785 CURVE SMOOTH",
-"816 806 OFFCURVE",
-"829 823 OFFCURVE",
-"851 852 CURVE",
-"757 875 LINE",
-"727 833 OFFCURVE",
-"710 813 OFFCURVE",
-"710 775 CURVE SMOOTH",
-"710 730 OFFCURVE",
-"757 644 OFFCURVE",
-"851 644 CURVE SMOOTH",
-"943 644 OFFCURVE",
-"1025 691 OFFCURVE",
-"1025 798 CURVE SMOOTH",
-"1025 868 OFFCURVE",
-"977 979 OFFCURVE",
-"644 979 CURVE SMOOTH",
-"411 979 OFFCURVE",
-"288 917 OFFCURVE",
-"288 792 CURVE SMOOTH",
-"288 696 OFFCURVE",
-"341 643 OFFCURVE",
-"432 643 CURVE SMOOTH",
-"474 643 OFFCURVE",
-"515 653 OFFCURVE",
-"614 653 CURVE SMOOTH"
+name = ddiivowelsinh;
+transform = "{1, 0, 0, 1, 230, 0}";
+}
 );
-},
+layerId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
+paths = (
 {
 closed = 1;
 nodes = (
-"20 134 OFFCURVE",
-"94 -5 OFFCURVE",
-"233 -5 CURVE",
-"233 38 OFFCURVE",
-"234 91 OFFCURVE",
-"234 133 CURVE",
-"192 134 OFFCURVE",
+"20 164 OFFCURVE",
+"50 70 OFFCURVE",
+"103 0 CURVE",
+"239 38 LINE",
+"186 116 OFFCURVE",
 "160 188 OFFCURVE",
-"160 304 CURVE SMOOTH",
-"160 407 OFFCURVE",
-"189 510 OFFCURVE",
-"261 510 CURVE SMOOTH",
-"283 510 OFFCURVE",
-"302 496 OFFCURVE",
-"304 475 CURVE",
-"384 520 LINE",
-"376 557 OFFCURVE",
-"315 622 OFFCURVE",
-"239 622 CURVE SMOOTH",
-"111 622 OFFCURVE",
-"20 508 OFFCURVE",
-"20 305 CURVE SMOOTH"
+"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 = 1123;
+width = 1151;
 },
 {
 associatedMasterId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
@@ -1131,6 +748,164 @@ nodes = (
 }
 );
 width = 900;
+},
+{
+associatedMasterId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
+components = (
+{
+name = ddiivowelsinh;
+transform = "{1, 0, 0, 1, 200, 0}";
+}
+);
+layerId = "1CFC2011-CC6E-41A9-B30A-D5FC5A213487";
+name = "30 Dec 24 at 01:36";
+paths = (
+{
+closed = 1;
+nodes = (
+"790 653 OFFCURVE",
+"938 562 OFFCURVE",
+"938 363 CURVE SMOOTH",
+"938 233 OFFCURVE",
+"897 137 OFFCURVE",
+"806 137 CURVE SMOOTH",
+"757 137 OFFCURVE",
+"721 172 OFFCURVE",
+"721 244 CURVE SMOOTH",
+"721 248 LINE",
+"587 248 LINE",
+"587 244 LINE SMOOTH",
+"587 176 OFFCURVE",
+"553 137 OFFCURVE",
+"497 137 CURVE SMOOTH",
+"431 137 OFFCURVE",
+"404 173 OFFCURVE",
+"404 226 CURVE SMOOTH",
+"404 306 OFFCURVE",
+"458 330 OFFCURVE",
+"532 330 CURVE SMOOTH",
+"652 330 LINE",
+"652 411 LINE SMOOTH",
+"652 536 OFFCURVE",
+"585 623 OFFCURVE",
+"455 622 CURVE SMOOTH",
+"347 621 OFFCURVE",
+"288 562 OFFCURVE",
+"288 490 CURVE SMOOTH",
+"288 489 OFFCURVE",
+"289 480 OFFCURVE",
+"289 475 CURVE",
+"330 475 OFFCURVE",
+"402 475 OFFCURVE",
+"429 475 CURVE",
+"429 487 OFFCURVE",
+"440 504 OFFCURVE",
+"469 504 CURVE SMOOTH",
+"498 504 OFFCURVE",
+"518 483 OFFCURVE",
+"515 444 CURVE",
+"218 444 LINE",
+"218 330 LINE",
+"246 330 LINE",
+"299 334 OFFCURVE",
+"349 339 OFFCURVE",
+"380 342 CURVE",
+"329 358 LINE",
+"281 326 OFFCURVE",
+"243 276 OFFCURVE",
+"243 192 CURVE SMOOTH",
+"243 69 OFFCURVE",
+"337 -11 OFFCURVE",
+"473 -11 CURVE SMOOTH",
+"565 -11 OFFCURVE",
+"632 38 OFFCURVE",
+"655 112 CURVE",
+"678 38 OFFCURVE",
+"749 -11 OFFCURVE",
+"835 -11 CURVE SMOOTH",
+"986 -11 OFFCURVE",
+"1099 86 OFFCURVE",
+"1099 350 CURVE SMOOTH",
+"1099 614 OFFCURVE",
+"926 775 OFFCURVE",
+"632 775 CURVE SMOOTH",
+"559 775 OFFCURVE",
+"523 769 OFFCURVE",
+"474 766 CURVE SMOOTH",
+"448 764 OFFCURVE",
+"431 774 OFFCURVE",
+"431 793 CURVE SMOOTH",
+"431 834 OFFCURVE",
+"473 852 OFFCURVE",
+"645 852 CURVE SMOOTH",
+"709 852 OFFCURVE",
+"768 843 OFFCURVE",
+"806 831 CURVE",
+"875 848 OFFCURVE",
+"911 824 OFFCURVE",
+"911 788 CURVE SMOOTH",
+"911 764 OFFCURVE",
+"896 740 OFFCURVE",
+"864 740 CURVE SMOOTH",
+"833 740 OFFCURVE",
+"816 760 OFFCURVE",
+"816 785 CURVE SMOOTH",
+"816 806 OFFCURVE",
+"829 823 OFFCURVE",
+"851 852 CURVE",
+"757 875 LINE",
+"727 833 OFFCURVE",
+"710 813 OFFCURVE",
+"710 775 CURVE SMOOTH",
+"710 730 OFFCURVE",
+"757 644 OFFCURVE",
+"851 644 CURVE SMOOTH",
+"943 644 OFFCURVE",
+"1025 691 OFFCURVE",
+"1025 798 CURVE SMOOTH",
+"1025 868 OFFCURVE",
+"977 979 OFFCURVE",
+"644 979 CURVE SMOOTH",
+"411 979 OFFCURVE",
+"288 917 OFFCURVE",
+"288 792 CURVE SMOOTH",
+"288 696 OFFCURVE",
+"341 643 OFFCURVE",
+"432 643 CURVE SMOOTH",
+"474 643 OFFCURVE",
+"515 653 OFFCURVE",
+"614 653 CURVE SMOOTH"
+);
+},
+{
+closed = 1;
+nodes = (
+"20 134 OFFCURVE",
+"94 -5 OFFCURVE",
+"233 -5 CURVE",
+"233 38 OFFCURVE",
+"234 91 OFFCURVE",
+"234 133 CURVE",
+"192 134 OFFCURVE",
+"160 188 OFFCURVE",
+"160 304 CURVE SMOOTH",
+"160 407 OFFCURVE",
+"189 510 OFFCURVE",
+"261 510 CURVE SMOOTH",
+"283 510 OFFCURVE",
+"302 496 OFFCURVE",
+"304 475 CURVE",
+"384 520 LINE",
+"376 557 OFFCURVE",
+"315 622 OFFCURVE",
+"239 622 CURVE SMOOTH",
+"111 622 OFFCURVE",
+"20 508 OFFCURVE",
+"20 305 CURVE SMOOTH"
+);
+}
+);
+width = 1123;
 }
 );
 leftMetricsKey = gasinh;
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/nnddivowelsinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/nnddivowelsinh.glyph
index 2d6684a5..dcf69ae3 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/nnddivowelsinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/nnddivowelsinh.glyph
@@ -3,429 +3,97 @@ color = 3;
 glyphname = nnddivowelsinh;
 layers = (
 {
-layerId = "7977A986-4EFB-4152-84F8-5A02CD382AAF";
-paths = (
+components = (
 {
-closed = 1;
-nodes = (
-"779 -11 OFFCURVE",
-"866 77 OFFCURVE",
-"866 328 CURVE SMOOTH",
-"866 476 OFFCURVE",
-"832 577 OFFCURVE",
-"763 641 CURVE SMOOTH",
-"691 708 OFFCURVE",
-"594 735 OFFCURVE",
-"441 735 CURVE SMOOTH",
-"370 735 LINE SMOOTH",
-"304 735 OFFCURVE",
-"273 741 OFFCURVE",
-"254 757 CURVE SMOOTH",
-"238 771 OFFCURVE",
-"232 789 OFFCURVE",
-"232 812 CURVE SMOOTH",
-"232 900 OFFCURVE",
-"338 931 OFFCURVE",
-"496 931 CURVE SMOOTH",
-"714 931 OFFCURVE",
-"795 875 OFFCURVE",
-"795 783 CURVE SMOOTH",
-"795 741 OFFCURVE",
-"780 708 OFFCURVE",
-"763 680 CURVE",
-"788 669 LINE",
-"807 701 OFFCURVE",
-"822 739 OFFCURVE",
-"822 782 CURVE SMOOTH",
-"822 867 OFFCURVE",
-"766 957 OFFCURVE",
-"496 957 CURVE SMOOTH",
-"283 957 OFFCURVE",
-"205 898 OFFCURVE",
-"205 811 CURVE SMOOTH",
-"205 784 OFFCURVE",
-"212 764 OFFCURVE",
-"225 749 CURVE SMOOTH",
-"251 718 OFFCURVE",
-"293 709 OFFCURVE",
-"365 709 CURVE SMOOTH",
-"427 709 LINE SMOOTH",
-"588 709 OFFCURVE",
-"677 685 OFFCURVE",
-"744 622 CURVE SMOOTH",
-"808 562 OFFCURVE",
-"839 468 OFFCURVE",
-"839 326 CURVE SMOOTH",
-"839 95 OFFCURVE",
-"767 15 OFFCURVE",
-"654 15 CURVE SMOOTH",
-"537 15 OFFCURVE",
-"505 117 OFFCURVE",
-"505 171 CURVE SMOOTH",
-"505 204 LINE",
-"479 204 LINE",
-"479 170 LINE SMOOTH",
-"479 109 OFFCURVE",
-"443 15 OFFCURVE",
-"332 15 CURVE SMOOTH",
-"245 15 OFFCURVE",
-"179 71 OFFCURVE",
-"179 203 CURVE SMOOTH",
-"179 266 OFFCURVE",
-"198 313 OFFCURVE",
-"230 348 CURVE SMOOTH",
-"281 404 OFFCURVE",
-"368 429 OFFCURVE",
-"467 429 CURVE SMOOTH",
-"492 429 LINE",
-"492 446 LINE SMOOTH",
-"492 544 OFFCURVE",
-"438 612 OFFCURVE",
-"341 612 CURVE SMOOTH",
-"264 612 OFFCURVE",
-"214 566 OFFCURVE",
-"214 498 CURVE SMOOTH",
-"214 493 OFFCURVE",
-"214 485 OFFCURVE",
-"215 476 CURVE",
-"242 478 LINE",
-"241 484 OFFCURVE",
-"241 490 OFFCURVE",
-"241 495 CURVE SMOOTH",
-"241 557 OFFCURVE",
-"278 586 OFFCURVE",
-"343 586 CURVE SMOOTH",
-"413 586 OFFCURVE",
-"461 541 OFFCURVE",
-"466 455 CURVE",
-"139 455 LINE",
-"139 429 LINE",
-"230 429 LINE SMOOTH",
-"281 429 OFFCURVE",
-"324 432 OFFCURVE",
-"370 436 CURVE SMOOTH",
-"364 436 LINE",
-"209 412 OFFCURVE",
-"152 315 OFFCURVE",
-"152 203 CURVE SMOOTH",
-"152 65 OFFCURVE",
-"221 -11 OFFCURVE",
-"333 -11 CURVE SMOOTH",
-"423 -11 OFFCURVE",
-"471 39 OFFCURVE",
-"492 109 CURVE",
-"510 39 OFFCURVE",
-"565 -11 OFFCURVE",
-"655 -11 CURVE SMOOTH"
+name = ddivowelsinh;
+transform = "{1, 0, 0, 1, 170, 0}";
+}
 );
-},
+layerId = "7977A986-4EFB-4152-84F8-5A02CD382AAF";
+paths = (
 {
 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",
-"324 587 CURVE SMOOTH",
-"352 587 OFFCURVE",
-"364 587 OFFCURVE",
-"377 586 CURVE",
-"394 604 LINE",
-"374 609 OFFCURVE",
-"355 612 OFFCURVE",
-"327 612 CURVE SMOOTH",
-"162 612 OFFCURVE",
-"41 512 OFFCURVE",
-"41 328 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 473 OFFCURVE",
+"234 588 OFFCURVE",
+"361 588 CURVE",
+"360 610 LINE",
+"217 610 OFFCURVE",
+"41 487 OFFCURVE",
+"41 256 CURVE SMOOTH"
 );
 }
 );
-width = 907;
+width = 945;
 },
 {
-layerId = UUID0;
-paths = (
+components = (
 {
-closed = 1;
-nodes = (
-"859 -11 OFFCURVE",
-"959 79 OFFCURVE",
-"959 323 CURVE SMOOTH",
-"959 458 OFFCURVE",
-"929 557 OFFCURVE",
-"871 625 CURVE SMOOTH",
-"799 709 OFFCURVE",
-"689 747 OFFCURVE",
-"526 747 CURVE SMOOTH",
-"420 747 LINE SMOOTH",
-"367 747 OFFCURVE",
-"339 751 OFFCURVE",
-"325 764 CURVE SMOOTH",
-"317 771 OFFCURVE",
-"311 783 OFFCURVE",
-"311 799 CURVE SMOOTH",
-"311 858 OFFCURVE",
-"383 887 OFFCURVE",
-"558 887 CURVE SMOOTH",
-"780 887 OFFCURVE",
-"826 832 OFFCURVE",
-"826 769 CURVE SMOOTH",
-"826 737 OFFCURVE",
-"820 716 OFFCURVE",
-"812 698 CURVE",
-"878 677 LINE",
-"889 706 OFFCURVE",
-"898 733 OFFCURVE",
-"898 770 CURVE SMOOTH",
-"898 860 OFFCURVE",
-"844 957 OFFCURVE",
-"553 957 CURVE SMOOTH",
-"322 957 OFFCURVE",
-"239 891 OFFCURVE",
-"239 798 CURVE SMOOTH",
-"239 759 OFFCURVE",
-"252 732 OFFCURVE",
-"274 713 CURVE SMOOTH",
-"302 688 OFFCURVE",
-"339 677 OFFCURVE",
-"427 677 CURVE SMOOTH",
-"503 677 LINE SMOOTH",
-"667 677 OFFCURVE",
-"746 649 OFFCURVE",
-"804 587 CURVE SMOOTH",
-"858 529 OFFCURVE",
-"884 441 OFFCURVE",
-"884 322 CURVE SMOOTH",
-"884 122 OFFCURVE",
-"811 60 OFFCURVE",
-"721 60 CURVE SMOOTH",
-"617 60 OFFCURVE",
-"587 122 OFFCURVE",
-"587 208 CURVE SMOOTH",
-"587 214 LINE",
-"520 214 LINE",
-"520 208 LINE SMOOTH",
-"520 119 OFFCURVE",
-"486 60 OFFCURVE",
-"386 60 CURVE SMOOTH",
-"304 60 OFFCURVE",
-"252 111 OFFCURVE",
-"252 204 CURVE SMOOTH",
-"252 268 OFFCURVE",
-"274 311 OFFCURVE",
-"309 340 CURVE SMOOTH",
-"368 389 OFFCURVE",
-"448 389 OFFCURVE",
-"518 389 CURVE SMOOTH",
-"568 389 LINE",
-"568 430 LINE SMOOTH",
-"568 549 OFFCURVE",
-"507 612 OFFCURVE",
-"399 612 CURVE SMOOTH",
-"309 612 OFFCURVE",
-"255 572 OFFCURVE",
-"255 496 CURVE SMOOTH",
-"255 490 OFFCURVE",
-"255 481 OFFCURVE",
-"256 474 CURVE",
-"329 478 LINE",
-"328 482 OFFCURVE",
-"328 486 OFFCURVE",
-"328 490 CURVE SMOOTH",
-"328 526 OFFCURVE",
-"354 546 OFFCURVE",
-"405 546 CURVE SMOOTH",
-"456 546 OFFCURVE",
-"492 517 OFFCURVE",
-"496 455 CURVE",
-"176 455 LINE",
-"176 389 LINE",
-"186 389 LINE SMOOTH",
-"225 389 OFFCURVE",
-"285 389 OFFCURVE",
-"323 397 CURVE",
-"321 406 LINE",
-"216 365 OFFCURVE",
-"179 287 OFFCURVE",
-"179 204 CURVE SMOOTH",
-"179 65 OFFCURVE",
-"265 -11 OFFCURVE",
-"384 -11 CURVE SMOOTH",
-"473 -11 OFFCURVE",
-"513 23 OFFCURVE",
-"554 77 CURVE",
-"589 29 OFFCURVE",
-"634 -11 OFFCURVE",
-"719 -11 CURVE SMOOTH"
+name = ddivowelsinh;
+transform = "{1, 0, 0, 1, 200, 0}";
+}
 );
-},
+layerId = UUID0;
+paths = (
 {
 closed = 1;
 nodes = (
-"36 228 OFFCURVE",
-"63 140 OFFCURVE",
-"99 83 CURVE",
-"165 118 LINE",
-"126 172 OFFCURVE",
-"109 240 OFFCURVE",
-"109 312 CURVE SMOOTH",
-"109 460 OFFCURVE",
-"193 549 OFFCURVE",
-"348 549 CURVE SMOOTH",
-"358 549 OFFCURVE",
-"375 547 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"
+"36 158 OFFCURVE",
+"72 71 OFFCURVE",
+"119 0 CURVE",
+"185 34 LINE",
+"140 99 OFFCURVE",
+"109 180 OFFCURVE",
+"109 268 CURVE SMOOTH",
+"109 451 OFFCURVE",
+"223 558 OFFCURVE",
+"425 558 CURVE",
+"420 612 LINE",
+"195 612 OFFCURVE",
+"36 507 OFFCURVE",
+"36 263 CURVE SMOOTH"
 );
 }
 );
-width = 995;
+width = 1045;
 },
 {
-layerId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
-paths = (
+components = (
 {
-closed = 1;
-nodes = (
-"790 653 OFFCURVE",
-"938 562 OFFCURVE",
-"938 363 CURVE SMOOTH",
-"938 233 OFFCURVE",
-"897 137 OFFCURVE",
-"806 137 CURVE SMOOTH",
-"757 137 OFFCURVE",
-"721 172 OFFCURVE",
-"721 244 CURVE SMOOTH",
-"721 248 LINE",
-"587 248 LINE",
-"587 244 LINE SMOOTH",
-"587 176 OFFCURVE",
-"553 137 OFFCURVE",
-"497 137 CURVE SMOOTH",
-"431 137 OFFCURVE",
-"404 173 OFFCURVE",
-"404 226 CURVE SMOOTH",
-"404 306 OFFCURVE",
-"458 330 OFFCURVE",
-"532 330 CURVE SMOOTH",
-"652 330 LINE",
-"652 411 LINE SMOOTH",
-"652 536 OFFCURVE",
-"585 623 OFFCURVE",
-"455 622 CURVE SMOOTH",
-"347 621 OFFCURVE",
-"288 562 OFFCURVE",
-"288 490 CURVE SMOOTH",
-"288 489 OFFCURVE",
-"289 480 OFFCURVE",
-"289 475 CURVE",
-"330 475 OFFCURVE",
-"402 475 OFFCURVE",
-"429 475 CURVE",
-"429 487 OFFCURVE",
-"440 504 OFFCURVE",
-"469 504 CURVE SMOOTH",
-"498 504 OFFCURVE",
-"518 483 OFFCURVE",
-"515 444 CURVE",
-"218 444 LINE",
-"218 330 LINE",
-"246 330 LINE",
-"299 334 OFFCURVE",
-"349 339 OFFCURVE",
-"380 342 CURVE",
-"329 358 LINE",
-"281 326 OFFCURVE",
-"243 276 OFFCURVE",
-"243 192 CURVE SMOOTH",
-"243 69 OFFCURVE",
-"337 -11 OFFCURVE",
-"473 -11 CURVE SMOOTH",
-"565 -11 OFFCURVE",
-"632 38 OFFCURVE",
-"655 112 CURVE",
-"678 38 OFFCURVE",
-"749 -11 OFFCURVE",
-"835 -11 CURVE SMOOTH",
-"986 -11 OFFCURVE",
-"1099 86 OFFCURVE",
-"1099 350 CURVE SMOOTH",
-"1099 614 OFFCURVE",
-"938 775 OFFCURVE",
-"632 775 CURVE SMOOTH",
-"559 775 OFFCURVE",
-"523 769 OFFCURVE",
-"474 766 CURVE SMOOTH",
-"448 764 OFFCURVE",
-"431 774 OFFCURVE",
-"431 793 CURVE SMOOTH",
-"431 834 OFFCURVE",
-"473 848 OFFCURVE",
-"645 848 CURVE SMOOTH",
-"860 848 OFFCURVE",
-"884 824 OFFCURVE",
-"884 778 CURVE SMOOTH",
-"884 759 OFFCURVE",
-"873 738 OFFCURVE",
-"829 719 CURVE",
-"926 663 LINE",
-"1012 706 OFFCURVE",
-"1025 753 OFFCURVE",
-"1025 798 CURVE SMOOTH",
-"1025 868 OFFCURVE",
-"977 979 OFFCURVE",
-"644 979 CURVE SMOOTH",
-"388 979 OFFCURVE",
-"288 917 OFFCURVE",
-"288 792 CURVE SMOOTH",
-"288 696 OFFCURVE",
-"341 643 OFFCURVE",
-"432 643 CURVE SMOOTH",
-"474 643 OFFCURVE",
-"515 653 OFFCURVE",
-"614 653 CURVE SMOOTH"
+name = ddivowelsinh;
+transform = "{1, 0, 0, 1, 240, 0}";
+}
 );
-},
+layerId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
+paths = (
 {
 closed = 1;
 nodes = (
-"20 134 OFFCURVE",
-"94 -5 OFFCURVE",
-"233 -5 CURVE",
-"233 38 OFFCURVE",
-"234 91 OFFCURVE",
-"234 133 CURVE",
-"192 134 OFFCURVE",
+"20 164 OFFCURVE",
+"50 70 OFFCURVE",
+"103 0 CURVE",
+"239 38 LINE",
+"186 116 OFFCURVE",
 "160 188 OFFCURVE",
-"160 304 CURVE SMOOTH",
-"160 407 OFFCURVE",
-"189 510 OFFCURVE",
-"261 510 CURVE SMOOTH",
-"283 510 OFFCURVE",
-"302 496 OFFCURVE",
-"304 475 CURVE",
-"384 520 LINE",
-"376 557 OFFCURVE",
-"315 622 OFFCURVE",
-"239 622 CURVE SMOOTH",
-"111 622 OFFCURVE",
-"20 508 OFFCURVE",
-"20 305 CURVE SMOOTH"
+"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 = 1123;
+width = 1161;
 },
 {
 associatedMasterId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/nngasinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/nngasinh.glyph
index c1067c9d..b2484023 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/nngasinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/nngasinh.glyph
@@ -6,33 +6,32 @@ layers = (
 anchors = (
 {
 name = below;
-position = "{697, -1}";
+position = "{677, -1}";
 },
 {
 name = repaya;
-position = "{557.23, 730}";
+position = "{537, 730}";
 },
 {
 name = top;
-position = "{443, 533}";
+position = "{423, 533}";
 },
 {
 name = virama;
-position = "{816, 536}";
+position = "{796, 536}";
 }
 );
 components = (
 {
 name = gasinh;
-transform = "{1, 0, 0, 1, 192, 0}";
+transform = "{1, 0, 0, 1, 172, 0}";
 },
 {
 name = "sanyaka-sinh";
-transform = "{1, 0, 0, 1, 20, 0}";
 }
 );
 layerId = "7977A986-4EFB-4152-84F8-5A02CD382AAF";
-width = 997;
+width = 1052;
 },
 {
 anchors = (
@@ -70,33 +69,33 @@ width = 1118;
 anchors = (
 {
 name = below;
-position = "{804, -1}";
+position = "{834, -1}";
 },
 {
 name = repaya;
-position = "{634.359, 730}";
+position = "{664, 730}";
 },
 {
 name = top;
-position = "{508, 533}";
+position = "{538, 533}";
 },
 {
 name = virama;
-position = "{942, 536}";
+position = "{972, 536}";
 }
 );
 components = (
 {
 name = gasinh;
-transform = "{1, 0, 0, 1, 192, 0}";
+transform = "{1, 0, 0, 1, 222, 0}";
 },
 {
 name = "sanyaka-sinh";
-transform = "{1, 0, 0, 1, -20, 0}";
+transform = "{1, 0, 0, 1, 10, 0}";
 }
 );
 layerId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
-width = 1135;
+width = 1165;
 },
 {
 anchors = (
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/nyacasinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/nyacasinh.glyph
index 76c55657..fa1919e3 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/nyacasinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/nyacasinh.glyph
@@ -3,6 +3,12 @@ color = 11;
 glyphname = nyacasinh;
 layers = (
 {
+anchors = (
+{
+name = repaya;
+position = "{472.402, 800}";
+}
+);
 layerId = "7977A986-4EFB-4152-84F8-5A02CD382AAF";
 paths = (
 {
@@ -205,6 +211,12 @@ nodes = (
 width = 943;
 },
 {
+anchors = (
+{
+name = repaya;
+position = "{589.274, 800}";
+}
+);
 layerId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
 paths = (
 {
@@ -303,6 +315,12 @@ nodes = (
 width = 1079;
 },
 {
+anchors = (
+{
+name = repaya;
+position = "{365.361, 800}";
+}
+);
 layerId = "CF8E177F-0CDC-40C1-8828-F158AA64F32E";
 paths = (
 {
@@ -401,6 +419,12 @@ nodes = (
 width = 669;
 },
 {
+anchors = (
+{
+name = repaya;
+position = "{398.128, 800}";
+}
+);
 layerId = "56AEB5FB-BA14-4784-B08F-18006463EEDB";
 paths = (
 {
@@ -499,6 +523,12 @@ nodes = (
 width = 729;
 },
 {
+anchors = (
+{
+name = repaya;
+position = "{474.04, 800}";
+}
+);
 layerId = "DC607D84-584B-45E6-A9EB-D1AF471CA2AE";
 paths = (
 {
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/nyjasinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/nyjasinh.glyph
index c66c2197..ef95190b 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/nyjasinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/nyjasinh.glyph
@@ -6,17 +6,17 @@ layers = (
 anchors = (
 {
 name = uvowel;
-position = "{794, 176}";
+position = "{854, 176}";
 },
 {
 name = virama;
-position = "{491, 430}";
+position = "{541, 430}";
 }
 );
 components = (
 {
 name = jasinh;
-transform = "{1, 0, 0, 1, 103, 0}";
+transform = "{1, 0, 0, 1, 113, 0}";
 }
 );
 layerId = "7977A986-4EFB-4152-84F8-5A02CD382AAF";
@@ -24,49 +24,49 @@ paths = (
 {
 closed = 1;
 nodes = (
-"41 228 OFFCURVE",
-"74 158 OFFCURVE",
-"120 83 CURVE",
-"144 96 LINE",
-"97 168 OFFCURVE",
-"68 240 OFFCURVE",
-"68 339 CURVE SMOOTH",
+"41 178 OFFCURVE",
+"74 108 OFFCURVE",
+"120 33 CURVE",
+"144 46 LINE",
+"97 118 OFFCURVE",
+"68 190 OFFCURVE",
+"68 289 CURVE SMOOTH",
 "68 453 OFFCURVE",
-"124 538 OFFCURVE",
-"218 577 CURVE SMOOTH",
-"237 585 OFFCURVE",
-"283 588 OFFCURVE",
-"308 588 CURVE SMOOTH",
-"320 588 OFFCURVE",
-"353 585 OFFCURVE",
-"366 583 CURVE",
-"367 597 LINE",
-"343 607 OFFCURVE",
-"320 612 OFFCURVE",
-"298 612 CURVE SMOOTH",
-"153 612 OFFCURVE",
+"134 538 OFFCURVE",
+"228 577 CURVE SMOOTH",
+"247 585 OFFCURVE",
+"293 588 OFFCURVE",
+"318 588 CURVE SMOOTH",
+"330 588 OFFCURVE",
+"363 585 OFFCURVE",
+"376 583 CURVE",
+"377 597 LINE",
+"353 607 OFFCURVE",
+"330 612 OFFCURVE",
+"308 612 CURVE SMOOTH",
+"163 612 OFFCURVE",
 "41 506 OFFCURVE",
-"41 339 CURVE SMOOTH"
+"41 289 CURVE SMOOTH"
 );
 }
 );
-width = 846;
+width = 856;
 },
 {
 anchors = (
 {
 name = uvowel;
-position = "{865.53, 176}";
+position = "{886, 176}";
 },
 {
 name = virama;
-position = "{545, 430}";
+position = "{582, 430}";
 }
 );
 components = (
 {
 name = jasinh;
-transform = "{1, 0, 0, 1, 130, 0}";
+transform = "{1, 0, 0, 1, 150, 0}";
 }
 );
 layerId = UUID0;
@@ -74,43 +74,43 @@ paths = (
 {
 closed = 1;
 nodes = (
-"36 221 OFFCURVE",
-"64 140 OFFCURVE",
-"99 83 CURVE",
-"165 119 LINE",
-"126 173 OFFCURVE",
-"109 240 OFFCURVE",
-"109 312 CURVE SMOOTH",
+"36 161 OFFCURVE",
+"74 80 OFFCURVE",
+"109 23 CURVE",
+"175 59 LINE",
+"136 113 OFFCURVE",
+"109 180 OFFCURVE",
+"109 282 CURVE SMOOTH",
 "109 440 OFFCURVE",
-"165 517 OFFCURVE",
-"265 545 CURVE SMOOTH",
-"272 547 OFFCURVE",
-"298 549 OFFCURVE",
-"331 549 CURVE SMOOTH",
-"335 549 OFFCURVE",
-"350 547 OFFCURVE",
-"357 547 CURVE",
-"417 592 LINE",
-"385 605 OFFCURVE",
-"352 612 OFFCURVE",
-"332 612 CURVE SMOOTH",
-"165 612 OFFCURVE",
+"185 517 OFFCURVE",
+"285 545 CURVE SMOOTH",
+"292 547 OFFCURVE",
+"318 549 OFFCURVE",
+"351 549 CURVE SMOOTH",
+"355 549 OFFCURVE",
+"370 547 OFFCURVE",
+"377 547 CURVE",
+"437 592 LINE",
+"405 605 OFFCURVE",
+"372 612 OFFCURVE",
+"352 612 CURVE SMOOTH",
+"185 612 OFFCURVE",
 "36 513 OFFCURVE",
-"36 315 CURVE SMOOTH"
+"36 285 CURVE SMOOTH"
 );
 }
 );
-width = 920;
+width = 940;
 },
 {
 anchors = (
 {
 name = uvowel;
-position = "{1042, 176}";
+position = "{1086, 176}";
 },
 {
 name = virama;
-position = "{662, 396}";
+position = "{672, 396}";
 }
 );
 components = (
@@ -124,45 +124,29 @@ paths = (
 {
 closed = 1;
 nodes = (
-"854 597 OFFCURVE",
-"862 585 OFFCURVE",
-"938 594 CURVE",
-"1012 626 OFFCURVE",
-"1049 659 OFFCURVE",
-"1097 709 CURVE",
-"1068 744 OFFCURVE",
-"1041 775 OFFCURVE",
-"1007 814 CURVE",
-"934 742 OFFCURVE",
-"892 677 OFFCURVE",
-"791 597 CURVE"
-);
-},
-{
-closed = 1;
-nodes = (
-"20 134 OFFCURVE",
-"94 -5 OFFCURVE",
-"233 -5 CURVE",
-"233 38 OFFCURVE",
-"234 91 OFFCURVE",
-"234 133 CURVE",
-"192 134 OFFCURVE",
+"20 164 OFFCURVE",
+"50 70 OFFCURVE",
+"103 0 CURVE",
+"239 38 LINE",
+"186 116 OFFCURVE",
 "160 188 OFFCURVE",
-"160 304 CURVE SMOOTH",
-"160 407 OFFCURVE",
-"168 508 OFFCURVE",
-"227 508 CURVE SMOOTH",
-"253 508 OFFCURVE",
-"266 484 OFFCURVE",
-"268 463 CURVE",
-"350 518 LINE",
-"314 583 OFFCURVE",
-"278 620 OFFCURVE",
-"202 620 CURVE SMOOTH",
-"74 620 OFFCURVE",
-"20 508 OFFCURVE",
-"20 305 CURVE SMOOTH"
+"160 271 CURVE SMOOTH",
+"160 362 OFFCURVE",
+"201 508 OFFCURVE",
+"432 508 CURVE SMOOTH",
+"441 508 OFFCURVE",
+"450 508 OFFCURVE",
+"459 507 CURVE SMOOTH",
+"488 505 OFFCURVE",
+"511 499 OFFCURVE",
+"524 497 CURVE",
+"557 569 LINE",
+"509 579 OFFCURVE",
+"524 622 OFFCURVE",
+"458 622 CURVE SMOOTH",
+"162 622 OFFCURVE",
+"20 493 OFFCURVE",
+"20 262 CURVE SMOOTH"
 );
 }
 );
@@ -449,6 +433,74 @@ nodes = (
 }
 );
 width = 833;
+},
+{
+anchors = (
+{
+name = uvowel;
+position = "{1042, 176}";
+},
+{
+name = virama;
+position = "{662, 396}";
+}
+);
+associatedMasterId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
+components = (
+{
+name = jasinh;
+transform = "{1, 0, 0, 1, 220, 0}";
+}
+);
+layerId = "9A3D5232-94D5-47DF-A3E3-DE00E31DDFC1";
+name = "30 Dec 24 at 01:27";
+paths = (
+{
+closed = 1;
+nodes = (
+"854 597 OFFCURVE",
+"862 585 OFFCURVE",
+"938 594 CURVE",
+"1012 626 OFFCURVE",
+"1049 659 OFFCURVE",
+"1097 709 CURVE",
+"1068 744 OFFCURVE",
+"1041 775 OFFCURVE",
+"1007 814 CURVE",
+"934 742 OFFCURVE",
+"892 677 OFFCURVE",
+"791 597 CURVE"
+);
+},
+{
+closed = 1;
+nodes = (
+"20 134 OFFCURVE",
+"94 -5 OFFCURVE",
+"233 -5 CURVE",
+"233 38 OFFCURVE",
+"234 91 OFFCURVE",
+"234 133 CURVE",
+"192 134 OFFCURVE",
+"160 188 OFFCURVE",
+"160 304 CURVE SMOOTH",
+"160 407 OFFCURVE",
+"168 508 OFFCURVE",
+"227 508 CURVE SMOOTH",
+"253 508 OFFCURVE",
+"266 484 OFFCURVE",
+"268 463 CURVE",
+"350 518 LINE",
+"314 583 OFFCURVE",
+"278 620 OFFCURVE",
+"202 620 CURVE SMOOTH",
+"74 620 OFFCURVE",
+"20 508 OFFCURVE",
+"20 305 CURVE SMOOTH"
+);
+}
+);
+width = 1101;
 }
 );
 leftMetricsKey = ttasinh;
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/tathasinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/tathasinh.glyph
index c6c74d86..f123ed3b 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/tathasinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/tathasinh.glyph
@@ -3,6 +3,12 @@ color = 11;
 glyphname = tathasinh;
 layers = (
 {
+anchors = (
+{
+name = repaya;
+position = "{849.503, 800}";
+}
+);
 layerId = "7977A986-4EFB-4152-84F8-5A02CD382AAF";
 paths = (
 {
@@ -323,6 +329,12 @@ nodes = (
 width = 1318;
 },
 {
+anchors = (
+{
+name = repaya;
+position = "{930.311, 800}";
+}
+);
 layerId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
 paths = (
 {
@@ -480,6 +492,12 @@ nodes = (
 width = 1370;
 },
 {
+anchors = (
+{
+name = repaya;
+position = "{622.697, 800}";
+}
+);
 layerId = "CF8E177F-0CDC-40C1-8828-F158AA64F32E";
 paths = (
 {
@@ -637,6 +655,12 @@ nodes = (
 width = 917;
 },
 {
+anchors = (
+{
+name = repaya;
+position = "{651.218, 800}";
+}
+);
 layerId = "56AEB5FB-BA14-4784-B08F-18006463EEDB";
 paths = (
 {
@@ -794,6 +818,12 @@ nodes = (
 width = 959;
 },
 {
+anchors = (
+{
+name = repaya;
+position = "{703.505, 800}";
+}
+);
 layerId = "DC607D84-584B-45E6-A9EB-D1AF471CA2AE";
 paths = (
 {
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/ttatthasinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/ttatthasinh.glyph
index 15024ca0..c201301b 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/ttatthasinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/ttatthasinh.glyph
@@ -3,6 +3,12 @@ color = 11;
 glyphname = ttatthasinh;
 layers = (
 {
+anchors = (
+{
+name = repaya;
+position = "{468.972, 800}";
+}
+);
 layerId = "7977A986-4EFB-4152-84F8-5A02CD382AAF";
 paths = (
 {
@@ -221,6 +227,12 @@ nodes = (
 width = 1007;
 },
 {
+anchors = (
+{
+name = repaya;
+position = "{567.676, 800}";
+}
+);
 layerId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
 paths = (
 {
@@ -327,6 +339,12 @@ nodes = (
 width = 1110;
 },
 {
+anchors = (
+{
+name = repaya;
+position = "{357.994, 800}";
+}
+);
 layerId = "CF8E177F-0CDC-40C1-8828-F158AA64F32E";
 paths = (
 {
@@ -433,6 +451,12 @@ nodes = (
 width = 700;
 },
 {
+anchors = (
+{
+name = repaya;
+position = "{392.259, 800}";
+}
+);
 layerId = "56AEB5FB-BA14-4784-B08F-18006463EEDB";
 paths = (
 {
@@ -539,6 +563,12 @@ nodes = (
 width = 767;
 },
 {
+anchors = (
+{
+name = repaya;
+position = "{459.255, 800}";
+}
+);
 layerId = "DC607D84-584B-45E6-A9EB-D1AF471CA2AE";
 paths = (
 {
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/ttivowelsinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/ttivowelsinh.glyph
index b155a054..bc4f7e06 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/ttivowelsinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/ttivowelsinh.glyph
@@ -11,18 +11,14 @@ nodes = (
 "596 -11 OFFCURVE",
 "700 158 OFFCURVE",
 "700 376 CURVE SMOOTH",
-"700 496 OFFCURVE",
-"669 579 OFFCURVE",
-"613 636 CURVE SMOOTH",
-"545 705 OFFCURVE",
-"451 735 OFFCURVE",
+"700 628 OFFCURVE",
+"565 735 OFFCURVE",
 "301 735 CURVE SMOOTH",
-"251 735 LINE SMOOTH",
-"185 735 OFFCURVE",
-"154 741 OFFCURVE",
-"135 757 CURVE SMOOTH",
-"119 771 OFFCURVE",
-"113 789 OFFCURVE",
+"284 735 OFFCURVE",
+"268 735 OFFCURVE",
+"251 735 CURVE SMOOTH",
+"178 735 OFFCURVE",
+"113 739 OFFCURVE",
 "113 812 CURVE SMOOTH",
 "113 900 OFFCURVE",
 "219 931 OFFCURVE",
@@ -31,10 +27,10 @@ nodes = (
 "629 875 OFFCURVE",
 "629 783 CURVE SMOOTH",
 "629 747 OFFCURVE",
-"619 717 OFFCURVE",
-"601 686 CURVE",
-"626 675 LINE",
-"644 709 OFFCURVE",
+"619 697 OFFCURVE",
+"561 666 CURVE",
+"586 655 LINE",
+"644 689 OFFCURVE",
 "656 743 OFFCURVE",
 "656 782 CURVE SMOOTH",
 "656 867 OFFCURVE",
@@ -43,18 +39,14 @@ nodes = (
 "166 957 OFFCURVE",
 "86 898 OFFCURVE",
 "86 811 CURVE SMOOTH",
-"86 784 OFFCURVE",
-"93 764 OFFCURVE",
-"106 749 CURVE SMOOTH",
-"132 718 OFFCURVE",
-"174 709 OFFCURVE",
+"86 728 OFFCURVE",
+"153 709 OFFCURVE",
 "246 709 CURVE SMOOTH",
-"294 709 LINE SMOOTH",
-"445 709 OFFCURVE",
-"528 683 OFFCURVE",
-"592 620 CURVE SMOOTH",
-"645 567 OFFCURVE",
-"673 489 OFFCURVE",
+"262 709 OFFCURVE",
+"278 709 OFFCURVE",
+"294 709 CURVE SMOOTH",
+"542 709 OFFCURVE",
+"673 622 OFFCURVE",
 "673 376 CURVE SMOOTH",
 "673 198 OFFCURVE",
 "598 15 OFFCURVE",
@@ -92,18 +84,14 @@ nodes = (
 "645 -11 OFFCURVE",
 "756 167 OFFCURVE",
 "756 375 CURVE SMOOTH",
-"756 491 OFFCURVE",
-"723 579 OFFCURVE",
-"667 638 CURVE SMOOTH",
-"597 711 OFFCURVE",
-"503 747 OFFCURVE",
+"756 629 OFFCURVE",
+"608 747 OFFCURVE",
 "342 747 CURVE SMOOTH",
-"262 747 LINE SMOOTH",
-"210 747 OFFCURVE",
-"183 751 OFFCURVE",
-"168 764 CURVE SMOOTH",
-"159 771 OFFCURVE",
-"154 783 OFFCURVE",
+"315 747 OFFCURVE",
+"289 747 OFFCURVE",
+"262 747 CURVE SMOOTH",
+"209 747 OFFCURVE",
+"154 746 OFFCURVE",
 "154 799 CURVE SMOOTH",
 "154 858 OFFCURVE",
 "229 887 OFFCURVE",
@@ -111,12 +99,12 @@ nodes = (
 "583 887 OFFCURVE",
 "635 832 OFFCURVE",
 "635 769 CURVE SMOOTH",
-"635 737 OFFCURVE",
-"628 716 OFFCURVE",
-"620 698 CURVE",
-"687 677 LINE",
-"699 706 OFFCURVE",
-"707 728 OFFCURVE",
+"635 727 OFFCURVE",
+"602 680 OFFCURVE",
+"564 662 CURVE",
+"631 641 LINE",
+"673 670 OFFCURVE",
+"707 718 OFFCURVE",
 "707 770 CURVE SMOOTH",
 "707 860 OFFCURVE",
 "646 957 OFFCURVE",
@@ -124,18 +112,14 @@ nodes = (
 "168 957 OFFCURVE",
 "82 892 OFFCURVE",
 "82 799 CURVE SMOOTH",
-"82 759 OFFCURVE",
-"95 732 OFFCURVE",
-"117 713 CURVE SMOOTH",
-"146 688 OFFCURVE",
-"183 677 OFFCURVE",
+"82 696 OFFCURVE",
+"164 677 OFFCURVE",
 "271 677 CURVE SMOOTH",
-"324 677 LINE SMOOTH",
-"473 677 OFFCURVE",
-"557 654 OFFCURVE",
-"620 580 CURVE SMOOTH",
-"660 533 OFFCURVE",
-"681 465 OFFCURVE",
+"289 677 OFFCURVE",
+"306 677 OFFCURVE",
+"324 677 CURVE SMOOTH",
+"590 677 OFFCURVE",
+"681 598 OFFCURVE",
 "681 374 CURVE SMOOTH",
 "681 228 OFFCURVE",
 "614 60 OFFCURVE",
@@ -165,47 +149,77 @@ nodes = (
 width = 792;
 },
 {
-components = (
-{
-name = _part.iVovewl;
-transform = "{1, 0, 0, 1, 24, 0}";
-}
-);
 layerId = "C62AB4C0-B70D-46F6-9B13-45217A94AFC9";
 paths = (
 {
 closed = 1;
 nodes = (
-"108 491 OFFCURVE",
-"24 402 OFFCURVE",
-"24 256 CURVE SMOOTH",
-"24 87 OFFCURVE",
-"158 -11 OFFCURVE",
-"386 -11 CURVE SMOOTH",
-"686 -11 OFFCURVE",
-"796 175 OFFCURVE",
-"796 402 CURVE",
-"620 402 LINE",
-"620 246 OFFCURVE",
-"555 141 OFFCURVE",
-"386 141 CURVE SMOOTH",
-"250 141 OFFCURVE",
-"195 194 OFFCURVE",
-"195 252 CURVE SMOOTH",
-"195 317 OFFCURVE",
-"240 356 OFFCURVE",
-"316 356 CURVE SMOOTH",
-"359 356 OFFCURVE",
-"393 356 OFFCURVE",
-"424 353 CURVE",
-"432 485 LINE",
-"404 488 OFFCURVE",
-"347 491 OFFCURVE",
-"297 491 CURVE SMOOTH"
+"734 -11 OFFCURVE",
+"817 189 OFFCURVE",
+"817 389 CURVE SMOOTH",
+"817 639 OFFCURVE",
+"681 780 OFFCURVE",
+"395 780 CURVE SMOOTH",
+"322 780 OFFCURVE",
+"280 774 OFFCURVE",
+"231 771 CURVE SMOOTH",
+"205 769 OFFCURVE",
+"188 774 OFFCURVE",
+"188 798 CURVE SMOOTH",
+"188 834 OFFCURVE",
+"230 848 OFFCURVE",
+"402 848 CURVE SMOOTH",
+"601 848 OFFCURVE",
+"625 824 OFFCURVE",
+"625 778 CURVE SMOOTH",
+"625 759 OFFCURVE",
+"614 738 OFFCURVE",
+"570 719 CURVE",
+"670 658 LINE",
+"749 705 OFFCURVE",
+"766 753 OFFCURVE",
+"766 798 CURVE SMOOTH",
+"766 868 OFFCURVE",
+"734 979 OFFCURVE",
+"401 979 CURVE SMOOTH",
+"145 979 OFFCURVE",
+"45 917 OFFCURVE",
+"45 792 CURVE SMOOTH",
+"45 696 OFFCURVE",
+"98 633 OFFCURVE",
+"189 633 CURVE SMOOTH",
+"231 633 OFFCURVE",
+"272 643 OFFCURVE",
+"371 643 CURVE SMOOTH",
+"561 643 OFFCURVE",
+"648 547 OFFCURVE",
+"648 389 CURVE SMOOTH",
+"648 239 OFFCURVE",
+"579 141 OFFCURVE",
+"382 141 CURVE SMOOTH",
+"246 141 OFFCURVE",
+"191 194 OFFCURVE",
+"191 252 CURVE SMOOTH",
+"191 317 OFFCURVE",
+"236 356 OFFCURVE",
+"312 356 CURVE SMOOTH",
+"355 356 OFFCURVE",
+"389 356 OFFCURVE",
+"420 353 CURVE",
+"428 485 LINE",
+"400 488 OFFCURVE",
+"343 491 OFFCURVE",
+"293 491 CURVE SMOOTH",
+"104 491 OFFCURVE",
+"20 402 OFFCURVE",
+"20 256 CURVE SMOOTH",
+"20 87 OFFCURVE",
+"154 -11 OFFCURVE",
+"382 -11 CURVE SMOOTH"
 );
 }
 );
-width = 820;
+width = 841;
 },
 {
 layerId = "CF8E177F-0CDC-40C1-8828-F158AA64F32E";
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/viivowelsinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/viivowelsinh.glyph
index 99ef9505..84b23447 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/viivowelsinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/viivowelsinh.glyph
@@ -8,119 +8,104 @@ paths = (
 {
 closed = 1;
 nodes = (
-"631 -11 OFFCURVE",
-"724 185 OFFCURVE",
-"724 376 CURVE SMOOTH",
-"724 492 OFFCURVE",
-"694 578 OFFCURVE",
-"633 637 CURVE SMOOTH",
-"610 660 OFFCURVE",
-"582 679 OFFCURVE",
-"547 693 CURVE",
-"489 723 OFFCURVE",
-"414 735 OFFCURVE",
-"310 735 CURVE SMOOTH",
-"251 735 LINE SMOOTH",
-"185 735 OFFCURVE",
-"154 741 OFFCURVE",
-"135 757 CURVE SMOOTH",
-"119 771 OFFCURVE",
-"113 789 OFFCURVE",
-"113 812 CURVE SMOOTH",
-"113 900 OFFCURVE",
-"219 931 OFFCURVE",
-"365 931 CURVE SMOOTH",
-"454 931 OFFCURVE",
-"533 921 OFFCURVE",
-"588 894 CURVE",
-"636 872 OFFCURVE",
-"666 835 OFFCURVE",
-"666 780 CURVE SMOOTH",
-"666 732 OFFCURVE",
-"641 708 OFFCURVE",
-"595 708 CURVE SMOOTH",
-"554 708 OFFCURVE",
-"520 728 OFFCURVE",
-"520 778 CURVE SMOOTH",
-"520 833 OFFCURVE",
-"557 866 OFFCURVE",
-"608 891 CURVE",
-"586 905 LINE",
-"529 874 OFFCURVE",
-"493 836 OFFCURVE",
-"493 778 CURVE SMOOTH",
-"493 715 OFFCURVE",
-"541 682 OFFCURVE",
-"596 682 CURVE SMOOTH",
-"658 682 OFFCURVE",
-"693 717 OFFCURVE",
-"693 780 CURVE SMOOTH",
-"693 882 OFFCURVE",
-"597 957 OFFCURVE",
-"365 957 CURVE SMOOTH",
-"164 957 OFFCURVE",
-"86 898 OFFCURVE",
-"86 811 CURVE SMOOTH",
-"86 784 OFFCURVE",
-"93 764 OFFCURVE",
-"106 749 CURVE SMOOTH",
-"132 718 OFFCURVE",
-"174 709 OFFCURVE",
-"246 709 CURVE SMOOTH",
-"305 709 LINE SMOOTH",
-"460 709 OFFCURVE",
-"551 683 OFFCURVE",
-"616 616 CURVE SMOOTH",
-"669 563 OFFCURVE",
-"697 485 OFFCURVE",
-"697 376 CURVE SMOOTH",
-"697 202 OFFCURVE",
-"620 15 OFFCURVE",
-"333 15 CURVE SMOOTH",
-"173 15 OFFCURVE",
-"68 88 OFFCURVE",
-"68 244 CURVE SMOOTH",
-"68 304 OFFCURVE",
-"87 343 OFFCURVE",
-"119 372 CURVE SMOOTH",
-"161 410 OFFCURVE",
-"212 429 OFFCURVE",
-"329 429 CURVE SMOOTH",
-"449 429 LINE",
-"449 447 LINE SMOOTH",
-"449 544 OFFCURVE",
-"395 612 OFFCURVE",
-"298 612 CURVE SMOOTH",
-"221 612 OFFCURVE",
-"171 572 OFFCURVE",
-"171 498 CURVE SMOOTH",
-"171 486 OFFCURVE",
-"173 470 OFFCURVE",
-"175 461 CURVE",
-"201 464 LINE",
-"199 474 OFFCURVE",
-"198 483 OFFCURVE",
-"198 496 CURVE SMOOTH",
-"198 557 OFFCURVE",
-"236 586 OFFCURVE",
-"300 586 CURVE SMOOTH",
-"363 586 OFFCURVE",
-"418 548 OFFCURVE",
-"423 455 CURVE",
-"329 455 LINE SMOOTH",
-"212 455 OFFCURVE",
-"146 433 OFFCURVE",
-"99 389 CURVE SMOOTH",
-"62 354 OFFCURVE",
-"41 307 OFFCURVE",
-"41 244 CURVE SMOOTH",
-"41 74 OFFCURVE",
-"157 -11 OFFCURVE",
-"335 -11 CURVE SMOOTH"
+"514 931 OFFCURVE",
+"563 907 OFFCURVE",
+"610 880 CURVE",
+"658 858 OFFCURVE",
+"686 815 OFFCURVE",
+"686 760 CURVE SMOOTH",
+"686 712 OFFCURVE",
+"661 688 OFFCURVE",
+"615 688 CURVE SMOOTH",
+"574 688 OFFCURVE",
+"540 708 OFFCURVE",
+"540 758 CURVE SMOOTH",
+"540 813 OFFCURVE",
+"577 846 OFFCURVE",
+"628 871 CURVE",
+"606 885 LINE",
+"549 854 OFFCURVE",
+"513 816 OFFCURVE",
+"513 758 CURVE SMOOTH",
+"513 695 OFFCURVE",
+"561 662 OFFCURVE",
+"616 662 CURVE SMOOTH",
+"678 662 OFFCURVE",
+"713 697 OFFCURVE",
+"713 760 CURVE SMOOTH",
+"713 862 OFFCURVE",
+"617 957 OFFCURVE",
+"375 957 CURVE SMOOTH",
+"194 957 OFFCURVE",
+"106 898 OFFCURVE",
+"106 811 CURVE SMOOTH",
+"106 728 OFFCURVE",
+"173 709 OFFCURVE",
+"266 709 CURVE SMOOTH",
+"286 709 OFFCURVE",
+"305 709 OFFCURVE",
+"325 709 CURVE SMOOTH",
+"566 709 OFFCURVE",
+"717 625 OFFCURVE",
+"717 388 CURVE SMOOTH",
+"717 149 OFFCURVE",
+"584 15 OFFCURVE",
+"364 15 CURVE SMOOTH",
+"190 15 OFFCURVE",
+"68 102 OFFCURVE",
+"68 225 CURVE SMOOTH",
+"68 333 OFFCURVE",
+"141 387 OFFCURVE",
+"289 387 CURVE SMOOTH",
+"442 387 LINE",
+"442 415 LINE SMOOTH",
+"442 541 OFFCURVE",
+"379 612 OFFCURVE",
+"272 612 CURVE SMOOTH",
+"201 612 OFFCURVE",
+"121 572 OFFCURVE",
+"121 479 CURVE SMOOTH",
+"121 472 OFFCURVE",
+"122 463 OFFCURVE",
+"125 452 CURVE",
+"151 452 LINE",
+"149 462 OFFCURVE",
+"148 472 OFFCURVE",
+"148 479 CURVE SMOOTH",
+"148 557 OFFCURVE",
+"216 586 OFFCURVE",
+"274 586 CURVE SMOOTH",
+"364 586 OFFCURVE",
+"415 525 OFFCURVE",
+"415 415 CURVE SMOOTH",
+"415 403 LINE",
+"427 413 LINE",
+"289 413 LINE SMOOTH",
+"123 413 OFFCURVE",
+"41 351 OFFCURVE",
+"41 225 CURVE SMOOTH",
+"41 86 OFFCURVE",
+"175 -11 OFFCURVE",
+"366 -11 CURVE SMOOTH",
+"602 -11 OFFCURVE",
+"744 132 OFFCURVE",
+"744 389 CURVE SMOOTH",
+"744 637 OFFCURVE",
+"582 735 OFFCURVE",
+"330 735 CURVE SMOOTH",
+"310 735 OFFCURVE",
+"291 735 OFFCURVE",
+"271 735 CURVE SMOOTH",
+"198 735 OFFCURVE",
+"133 739 OFFCURVE",
+"133 812 CURVE SMOOTH",
+"133 900 OFFCURVE",
+"249 931 OFFCURVE",
+"375 931 CURVE SMOOTH"
 );
 }
 );
-width = 765;
+width = 785;
 },
 {
 layerId = UUID0;
@@ -128,31 +113,9 @@ paths = (
 {
 closed = 1;
 nodes = (
-"665 -11 OFFCURVE",
-"776 170 OFFCURVE",
-"776 375 CURVE SMOOTH",
-"776 491 OFFCURVE",
-"741 581 OFFCURVE",
-"683 637 CURVE SMOOTH",
-"653 667 OFFCURVE",
-"620 686 OFFCURVE",
-"581 703 CURVE",
-"515 734 OFFCURVE",
-"441 747 OFFCURVE",
-"337 747 CURVE SMOOTH",
-"263 747 LINE SMOOTH",
-"210 747 OFFCURVE",
-"183 750 OFFCURVE",
-"168 764 CURVE SMOOTH",
-"160 771 OFFCURVE",
-"154 783 OFFCURVE",
-"154 799 CURVE SMOOTH",
-"154 858 OFFCURVE",
-"227 887 OFFCURVE",
-"389 887 CURVE SMOOTH",
 "452 887 OFFCURVE",
 "505 881 OFFCURVE",
-"543 874 CURVE SMOOTH",
+"543 874 CURVE",
 "629 855 OFFCURVE",
 "667 817 OFFCURVE",
 "667 771 CURVE SMOOTH",
@@ -181,62 +144,69 @@ nodes = (
 "164 957 OFFCURVE",
 "82 891 OFFCURVE",
 "82 799 CURVE SMOOTH",
-"82 759 OFFCURVE",
-"96 732 OFFCURVE",
-"118 713 CURVE SMOOTH",
-"147 688 OFFCURVE",
-"183 677 OFFCURVE",
+"82 701 OFFCURVE",
+"158 677 OFFCURVE",
 "271 677 CURVE SMOOTH",
-"333 677 LINE SMOOTH",
-"481 677 OFFCURVE",
-"567 658 OFFCURVE",
-"636 580 CURVE SMOOTH",
-"678 533 OFFCURVE",
-"701 465 OFFCURVE",
-"701 374 CURVE SMOOTH",
-"701 228 OFFCURVE",
-"632 60 OFFCURVE",
-"358 60 CURVE SMOOTH",
-"202 60 OFFCURVE",
+"292 677 OFFCURVE",
+"312 677 OFFCURVE",
+"333 677 CURVE SMOOTH",
+"570 677 OFFCURVE",
+"701 597 OFFCURVE",
+"701 398 CURVE SMOOTH",
+"701 181 OFFCURVE",
+"586 60 OFFCURVE",
+"379 60 CURVE SMOOTH",
+"216 60 OFFCURVE",
 "109 129 OFFCURVE",
-"109 246 CURVE SMOOTH",
-"109 287 OFFCURVE",
-"120 322 OFFCURVE",
-"151 347 CURVE SMOOTH",
-"184 374 OFFCURVE",
-"234 389 OFFCURVE",
-"330 389 CURVE SMOOTH",
-"460 389 LINE",
-"460 430 LINE SMOOTH",
-"460 549 OFFCURVE",
-"399 612 OFFCURVE",
-"291 612 CURVE SMOOTH",
-"202 612 OFFCURVE",
-"147 572 OFFCURVE",
-"147 496 CURVE SMOOTH",
-"147 479 OFFCURVE",
-"149 465 OFFCURVE",
-"151 455 CURVE",
-"222 466 LINE",
-"221 473 OFFCURVE",
-"220 480 OFFCURVE",
-"220 487 CURVE SMOOTH",
-"220 526 OFFCURVE",
-"244 546 OFFCURVE",
-"296 546 CURVE SMOOTH",
-"348 546 OFFCURVE",
-"386 517 OFFCURVE",
-"389 455 CURVE",
-"333 455 LINE SMOOTH",
-"216 455 OFFCURVE",
-"144 434 OFFCURVE",
-"99 396 CURVE SMOOTH",
-"56 360 OFFCURVE",
-"36 306 OFFCURVE",
-"36 248 CURVE SMOOTH",
+"109 227 CURVE SMOOTH",
+"109 328 OFFCURVE",
+"190 359 OFFCURVE",
+"302 359 CURVE SMOOTH",
+"460 359 LINE",
+"460 425 LINE SMOOTH",
+"460 526 OFFCURVE",
+"403 612 OFFCURVE",
+"274 612 CURVE SMOOTH",
+"180 612 OFFCURVE",
+"107 562 OFFCURVE",
+"107 476 CURVE SMOOTH",
+"107 469 OFFCURVE",
+"107 468 OFFCURVE",
+"108 458 CURVE",
+"181 458 LINE",
+"180 466 OFFCURVE",
+"180 468 OFFCURVE",
+"180 476 CURVE SMOOTH",
+"180 513 OFFCURVE",
+"205 546 OFFCURVE",
+"274 546 CURVE SMOOTH",
+"356 546 OFFCURVE",
+"388 488 OFFCURVE",
+"388 437 CURVE SMOOTH",
+"388 401 LINE",
+"422 425 LINE",
+"302 425 LINE SMOOTH",
+"146 425 OFFCURVE",
+"36 369 OFFCURVE",
+"36 227 CURVE SMOOTH",
 "36 89 OFFCURVE",
-"155 -11 OFFCURVE",
-"358 -11 CURVE SMOOTH"
+"169 -11 OFFCURVE",
+"379 -11 CURVE SMOOTH",
+"634 -11 OFFCURVE",
+"776 136 OFFCURVE",
+"776 375 CURVE SMOOTH",
+"776 643 OFFCURVE",
+"597 747 OFFCURVE",
+"337 747 CURVE SMOOTH",
+"312 747 OFFCURVE",
+"288 747 OFFCURVE",
+"263 747 CURVE SMOOTH",
+"209 747 OFFCURVE",
+"154 747 OFFCURVE",
+"154 799 CURVE SMOOTH",
+"154 858 OFFCURVE",
+"227 887 OFFCURVE",
+"389 887 CURVE SMOOTH"
 );
 }
 );
@@ -297,7 +267,6 @@ nodes = (
 "173 310 OFFCURVE",
 "198 330 OFFCURVE",
 "275 330 CURVE SMOOTH",
-"335 330 LINE",
 "455 330 LINE",
 "455 411 LINE SMOOTH",
 "455 536 OFFCURVE",
@@ -309,21 +278,21 @@ nodes = (
 "91 489 OFFCURVE",
 "92 480 OFFCURVE",
 "92 475 CURVE",
-"133 475 OFFCURVE",
-"205 475 OFFCURVE",
-"232 475 CURVE",
-"232 487 OFFCURVE",
-"243 504 OFFCURVE",
-"272 504 CURVE SMOOTH",
-"301 504 OFFCURVE",
-"321 483 OFFCURVE",
-"318 444 CURVE",
+"232 475 LINE",
+"232 476 OFFCURVE",
+"232 477 OFFCURVE",
+"232 477 CURVE SMOOTH",
+"232 490 OFFCURVE",
+"245 504 OFFCURVE",
+"271 504 CURVE SMOOTH",
+"303 504 OFFCURVE",
+"317 475 OFFCURVE",
+"317 437 CURVE",
+"317 375 LINE",
+"381 444 LINE",
 "311 444 LINE SMOOTH",
-"224 444 OFFCURVE",
-"165 446 OFFCURVE",
-"115 419 CURVE SMOOTH",
-"58 389 OFFCURVE",
-"20 335 OFFCURVE",
+"136 444 OFFCURVE",
+"20 419 OFFCURVE",
 "20 244 CURVE SMOOTH",
 "20 87 OFFCURVE",
 "142 -11 OFFCURVE",
diff --git a/sources/NotoSansSinhala.glyphspackage/glyphs/vivowelsinh.glyph b/sources/NotoSansSinhala.glyphspackage/glyphs/vivowelsinh.glyph
index 21c633e1..2d10db71 100644
--- a/sources/NotoSansSinhala.glyphspackage/glyphs/vivowelsinh.glyph
+++ b/sources/NotoSansSinhala.glyphspackage/glyphs/vivowelsinh.glyph
@@ -8,101 +8,89 @@ paths = (
 {
 closed = 1;
 nodes = (
-"631 -11 OFFCURVE",
-"724 185 OFFCURVE",
-"724 376 CURVE SMOOTH",
-"724 492 OFFCURVE",
-"694 578 OFFCURVE",
-"633 637 CURVE SMOOTH",
-"565 703 OFFCURVE",
-"474 735 OFFCURVE",
-"310 735 CURVE SMOOTH",
-"251 735 LINE SMOOTH",
-"185 735 OFFCURVE",
-"154 741 OFFCURVE",
-"135 757 CURVE SMOOTH",
-"119 771 OFFCURVE",
-"113 789 OFFCURVE",
-"113 812 CURVE SMOOTH",
-"113 900 OFFCURVE",
-"219 931 OFFCURVE",
-"365 931 CURVE SMOOTH",
-"572 931 OFFCURVE",
-"653 875 OFFCURVE",
-"653 783 CURVE SMOOTH",
-"653 747 OFFCURVE",
-"643 717 OFFCURVE",
-"624 685 CURVE",
-"649 674 LINE",
-"668 709 OFFCURVE",
-"680 743 OFFCURVE",
-"680 782 CURVE SMOOTH",
-"680 867 OFFCURVE",
-"624 957 OFFCURVE",
-"365 957 CURVE SMOOTH",
-"164 957 OFFCURVE",
-"86 898 OFFCURVE",
-"86 811 CURVE SMOOTH",
-"86 784 OFFCURVE",
-"93 764 OFFCURVE",
-"106 749 CURVE SMOOTH",
-"132 718 OFFCURVE",
-"174 709 OFFCURVE",
-"246 709 CURVE SMOOTH",
-"305 709 LINE SMOOTH",
-"460 709 OFFCURVE",
-"551 683 OFFCURVE",
-"616 616 CURVE SMOOTH",
-"669 563 OFFCURVE",
-"697 485 OFFCURVE",
-"697 376 CURVE SMOOTH",
-"697 202 OFFCURVE",
-"620 15 OFFCURVE",
-"333 15 CURVE SMOOTH",
-"173 15 OFFCURVE",
-"68 88 OFFCURVE",
-"68 244 CURVE SMOOTH",
-"68 304 OFFCURVE",
-"87 343 OFFCURVE",
-"119 372 CURVE SMOOTH",
-"161 410 OFFCURVE",
-"212 429 OFFCURVE",
-"329 429 CURVE SMOOTH",
-"449 429 LINE",
-"449 447 LINE SMOOTH",
-"449 544 OFFCURVE",
-"395 612 OFFCURVE",
-"298 612 CURVE SMOOTH",
-"221 612 OFFCURVE",
-"171 572 OFFCURVE",
-"171 498 CURVE SMOOTH",
-"171 486 OFFCURVE",
-"173 470 OFFCURVE",
-"175 461 CURVE",
-"201 464 LINE",
-"199 474 OFFCURVE",
-"198 483 OFFCURVE",
-"198 496 CURVE SMOOTH",
-"198 557 OFFCURVE",
-"236 586 OFFCURVE",
-"300 586 CURVE SMOOTH",
-"363 586 OFFCURVE",
-"418 548 OFFCURVE",
-"423 455 CURVE",
-"329 455 LINE SMOOTH",
-"212 455 OFFCURVE",
-"146 433 OFFCURVE",
-"99 389 CURVE SMOOTH",
-"62 354 OFFCURVE",
-"41 307 OFFCURVE",
-"41 244 CURVE SMOOTH",
-"41 74 OFFCURVE",
-"157 -11 OFFCURVE",
-"335 -11 CURVE SMOOTH"
+"744 632 OFFCURVE",
+"600 735 OFFCURVE",
+"300 735 CURVE SMOOTH",
+"280 735 OFFCURVE",
+"261 735 OFFCURVE",
+"241 735 CURVE SMOOTH",
+"168 735 OFFCURVE",
+"103 739 OFFCURVE",
+"103 812 CURVE SMOOTH",
+"103 900 OFFCURVE",
+"209 931 OFFCURVE",
+"355 931 CURVE SMOOTH",
+"582 931 OFFCURVE",
+"673 865 OFFCURVE",
+"673 773 CURVE SMOOTH",
+"673 737 OFFCURVE",
+"653 677 OFFCURVE",
+"604 645 CURVE",
+"629 634 LINE",
+"678 669 OFFCURVE",
+"700 733 OFFCURVE",
+"700 772 CURVE SMOOTH",
+"700 857 OFFCURVE",
+"634 957 OFFCURVE",
+"355 957 CURVE SMOOTH",
+"154 957 OFFCURVE",
+"76 898 OFFCURVE",
+"76 811 CURVE SMOOTH",
+"76 728 OFFCURVE",
+"143 709 OFFCURVE",
+"236 709 CURVE SMOOTH",
+"256 709 OFFCURVE",
+"275 709 OFFCURVE",
+"295 709 CURVE SMOOTH",
+"575 709 OFFCURVE",
+"717 624 OFFCURVE",
+"717 376 CURVE SMOOTH",
+"717 149 OFFCURVE",
+"584 15 OFFCURVE",
+"364 15 CURVE SMOOTH",
+"190 15 OFFCURVE",
+"68 102 OFFCURVE",
+"68 225 CURVE SMOOTH",
+"68 333 OFFCURVE",
+"141 387 OFFCURVE",
+"289 387 CURVE SMOOTH",
+"442 387 LINE",
+"442 415 LINE SMOOTH",
+"442 541 OFFCURVE",
+"379 612 OFFCURVE",
+"272 612 CURVE SMOOTH",
+"201 612 OFFCURVE",
+"121 572 OFFCURVE",
+"121 479 CURVE SMOOTH",
+"121 472 OFFCURVE",
+"122 463 OFFCURVE",
+"125 452 CURVE",
+"151 452 LINE",
+"149 462 OFFCURVE",
+"148 472 OFFCURVE",
+"148 479 CURVE SMOOTH",
+"148 557 OFFCURVE",
+"216 586 OFFCURVE",
+"274 586 CURVE SMOOTH",
+"364 586 OFFCURVE",
+"415 525 OFFCURVE",
+"415 415 CURVE SMOOTH",
+"415 403 LINE",
+"427 413 LINE",
+"289 413 LINE SMOOTH",
+"123 413 OFFCURVE",
+"41 351 OFFCURVE",
+"41 225 CURVE SMOOTH",
+"41 86 OFFCURVE",
+"175 -11 OFFCURVE",
+"366 -11 CURVE SMOOTH",
+"602 -11 OFFCURVE",
+"744 131 OFFCURVE",
+"744 376 CURVE SMOOTH"
 );
 }
 );
-width = 765;
+width = 785;
 },
 {
 layerId = UUID0;
@@ -110,21 +98,14 @@ paths = (
 {
 closed = 1;
 nodes = (
-"663 -11 OFFCURVE",
-"776 170 OFFCURVE",
-"776 375 CURVE SMOOTH",
-"776 491 OFFCURVE",
-"741 580 OFFCURVE",
-"683 638 CURVE SMOOTH",
-"605 716 OFFCURVE",
-"512 747 OFFCURVE",
+"776 630 OFFCURVE",
+"619 747 OFFCURVE",
 "350 747 CURVE SMOOTH",
-"262 747 LINE SMOOTH",
+"321 747 OFFCURVE",
+"291 747 OFFCURVE",
+"262 747 CURVE SMOOTH",
 "210 747 OFFCURVE",
-"183 750 OFFCURVE",
-"168 764 CURVE SMOOTH",
-"160 771 OFFCURVE",
-"154 783 OFFCURVE",
+"154 747 OFFCURVE",
 "154 799 CURVE SMOOTH",
 "154 858 OFFCURVE",
 "227 887 OFFCURVE",
@@ -133,10 +114,10 @@ nodes = (
 "653 832 OFFCURVE",
 "653 769 CURVE SMOOTH",
 "653 737 OFFCURVE",
-"646 716 OFFCURVE",
-"638 698 CURVE",
-"705 677 LINE",
-"717 706 OFFCURVE",
+"646 696 OFFCURVE",
+"588 658 CURVE",
+"655 637 LINE",
+"717 686 OFFCURVE",
 "725 728 OFFCURVE",
 "725 770 CURVE SMOOTH",
 "725 860 OFFCURVE",
@@ -145,62 +126,57 @@ nodes = (
 "164 957 OFFCURVE",
 "82 891 OFFCURVE",
 "82 799 CURVE SMOOTH",
-"82 759 OFFCURVE",
-"96 732 OFFCURVE",
-"118 713 CURVE SMOOTH",
-"146 688 OFFCURVE",
-"183 677 OFFCURVE",
+"82 701 OFFCURVE",
+"158 677 OFFCURVE",
 "271 677 CURVE SMOOTH",
-"333 677 LINE SMOOTH",
-"481 677 OFFCURVE",
-"567 658 OFFCURVE",
-"636 580 CURVE SMOOTH",
-"678 533 OFFCURVE",
-"701 465 OFFCURVE",
-"701 374 CURVE SMOOTH",
-"701 228 OFFCURVE",
-"632 60 OFFCURVE",
-"358 60 CURVE SMOOTH",
-"202 60 OFFCURVE",
+"292 677 OFFCURVE",
+"312 677 OFFCURVE",
+"333 677 CURVE SMOOTH",
+"570 677 OFFCURVE",
+"701 597 OFFCURVE",
+"701 381 CURVE SMOOTH",
+"701 181 OFFCURVE",
+"586 60 OFFCURVE",
+"379 60 CURVE SMOOTH",
+"216 60 OFFCURVE",
 "109 129 OFFCURVE",
-"109 246 CURVE SMOOTH",
-"109 287 OFFCURVE",
-"120 322 OFFCURVE",
-"151 347 CURVE SMOOTH",
-"184 374 OFFCURVE",
-"234 389 OFFCURVE",
-"330 389 CURVE SMOOTH",
-"460 389 LINE",
-"460 430 LINE SMOOTH",
-"460 549 OFFCURVE",
-"399 612 OFFCURVE",
-"291 612 CURVE SMOOTH",
-"202 612 OFFCURVE",
-"147 572 OFFCURVE",
-"147 496 CURVE SMOOTH",
-"147 479 OFFCURVE",
-"149 465 OFFCURVE",
-"151 455 CURVE",
-"222 466 LINE",
-"221 473 OFFCURVE",
-"220 480 OFFCURVE",
-"220 487 CURVE SMOOTH",
-"220 526 OFFCURVE",
-"244 546 OFFCURVE",
-"296 546 CURVE SMOOTH",
-"348 546 OFFCURVE",
-"386 517 OFFCURVE",
-"389 455 CURVE",
-"333 455 LINE SMOOTH",
-"211 455 OFFCURVE",
-"144 434 OFFCURVE",
-"99 396 CURVE SMOOTH",
-"56 360 OFFCURVE",
-"36 306 OFFCURVE",
-"36 248 CURVE SMOOTH",
+"109 227 CURVE SMOOTH",
+"109 328 OFFCURVE",
+"190 359 OFFCURVE",
+"302 359 CURVE SMOOTH",
+"460 359 LINE",
+"460 425 LINE SMOOTH",
+"460 526 OFFCURVE",
+"403 612 OFFCURVE",
+"274 612 CURVE SMOOTH",
+"180 612 OFFCURVE",
+"107 562 OFFCURVE",
+"107 476 CURVE SMOOTH",
+"107 469 OFFCURVE",
+"107 468 OFFCURVE",
+"108 458 CURVE",
+"181 458 LINE",
+"180 466 OFFCURVE",
+"180 468 OFFCURVE",
+"180 476 CURVE SMOOTH",
+"180 513 OFFCURVE",
+"205 546 OFFCURVE",
+"274 546 CURVE SMOOTH",
+"356 546 OFFCURVE",
+"388 488 OFFCURVE",
+"388 437 CURVE SMOOTH",
+"388 401 LINE",
+"422 425 LINE",
+"302 425 LINE SMOOTH",
+"146 425 OFFCURVE",
+"36 369 OFFCURVE",
+"36 227 CURVE SMOOTH",
 "36 89 OFFCURVE",
-"155 -11 OFFCURVE",
-"358 -11 CURVE SMOOTH"
+"169 -11 OFFCURVE",
+"379 -11 CURVE SMOOTH",
+"634 -11 OFFCURVE",
+"776 136 OFFCURVE",
+"776 375 CURVE SMOOTH"
 );
 }
 );
@@ -258,7 +234,6 @@ nodes = (
 "173 310 OFFCURVE",
 "198 330 OFFCURVE",
 "275 330 CURVE SMOOTH",
-"335 330 LINE",
 "455 330 LINE",
 "455 411 LINE SMOOTH",
 "455 536 OFFCURVE",
@@ -270,21 +245,21 @@ nodes = (
 "91 489 OFFCURVE",
 "92 480 OFFCURVE",
 "92 475 CURVE",
-"133 475 OFFCURVE",
-"205 475 OFFCURVE",
-"232 475 CURVE",
-"232 487 OFFCURVE",
-"243 504 OFFCURVE",
+"232 475 LINE",
+"232 476 OFFCURVE",
+"232 477 OFFCURVE",
+"232 477 CURVE SMOOTH",
+"232 489 OFFCURVE",
+"245 504 OFFCURVE",
 "272 504 CURVE SMOOTH",
-"301 504 OFFCURVE",
-"321 483 OFFCURVE",
-"318 444 CURVE",
+"320 504 OFFCURVE",
+"326 466 OFFCURVE",
+"326 423 CURVE SMOOTH",
+"326 375 LINE",
+"381 444 LINE",
 "311 444 LINE SMOOTH",
-"224 444 OFFCURVE",
-"165 446 OFFCURVE",
-"115 419 CURVE SMOOTH",
-"58 389 OFFCURVE",
-"20 335 OFFCURVE",
+"136 444 OFFCURVE",
+"20 419 OFFCURVE",
 "20 244 CURVE SMOOTH",
 "20 87 OFFCURVE",
 "142 -11 OFFCURVE",