diff --git a/source/org/thdl/tib/text/TibetanMachineWeb.java b/source/org/thdl/tib/text/TibetanMachineWeb.java
index 0ae7cc5..abb016a 100644
--- a/source/org/thdl/tib/text/TibetanMachineWeb.java
+++ b/source/org/thdl/tib/text/TibetanMachineWeb.java
@@ -407,6 +407,16 @@ public class TibetanMachineWeb implements THDLWylieConstants {
             validInputSequences.put(ntk, anyOldObjectWillDo);
         }
 
+        charSet.add("Y");
+        charSet.add("R");
+        charSet.add("W");
+
+        // Useless because none is two or more characters, but for
+        // completeness we put these in since EWTS allows w+W etc.
+        validInputSequences.put("Y", anyOldObjectWillDo);
+        validInputSequences.put("R", anyOldObjectWillDo);
+        validInputSequences.put("W", anyOldObjectWillDo);
+
         sTok = null;
 
 		top_vowels = new HashSet();
diff --git a/source/org/thdl/tib/text/tibwn.ini b/source/org/thdl/tib/text/tibwn.ini
index 9dbc328..4832b58 100644
--- a/source/org/thdl/tib/text/tibwn.ini
+++ b/source/org/thdl/tib/text/tibwn.ini
@@ -227,6 +227,11 @@ au~237,1~~8,89~~~~~~~0F7D~~8,104
 
 <?Input:Sanskrit?>
 
+// DLC NOW: who uses 10,99, 10,103, or 10,104?  R+, +R, r+, +r, what???  If they can be on top, the Unicode is wrong too!  Make TM/TMW->Unicode,EWTS,ACIP barf on these.
+W~228,5~~10,99~1,109~~1,123~1,125~~~0FBA
+Y~232,5~~10,103~1,109~~1,123~1,125~~~0FBB
+R~233,5~~10,104~1,109~~1,123~1,125~~~0FBC
+
 // 0F5F,0F39 might work, but the OpenType font's author must've had
 // the TMSkt4.146 glyph in mind if it does.  Note that the bottommost
 // horizontal stroke goes upward on U+0F5F and downward on U+0F5B.
@@ -824,12 +829,9 @@ ts~224,5~~10,95~1,110~~1,125~1,126~~~0FA9
 tsh~225,5~~10,96~1,110~~1,125~1,126~~~0FAA
 dz~226,5~~10,97~1,110~~1,125~1,126~~~0FAB
 dz+h~227,5~~10,98~1,110~~1,125~1,126~~~0FAC
-W~228,5~~10,99~1,109~~1,123~1,125~~~0FBA
 zh~229,5~~10,100~1,109~~1,123~1,125~~~0FAE
 z~230,5~~10,101~1,109~~1,123~1,125~~~0FAF
 '~231,5~~10,102~1,109~~1,123~1,125~~~0FB0
-Y~232,5~~10,103~1,109~~1,123~1,125~~~0FBB
-R~233,5~~10,104~1,109~~1,123~1,125~~~0FBC
 l~234,5~~10,105~1,109~~1,123~1,125~~~0FB3
 sh~235,5~~10,106~1,109~~1,123~1,125~~~0FB4
 Sh~236,5~~10,107~1,109~~1,123~1,125~~~0FB5