diff --git a/src/abstract/Lexicon.gf b/src/abstract/Lexicon.gf
index 07e40113..9dcf6f67 100644
--- a/src/abstract/Lexicon.gf
+++ b/src/abstract/Lexicon.gf
@@ -265,6 +265,7 @@ fun
   short_A : A ;
   silver_N : N ;
   sing_V : V ;
+  sing_V2 : V2 ;
   sister_N : N ;
   sit_V : V ;
   skin_N : N ;
diff --git a/src/malay/LexiconMay.gf b/src/malay/LexiconMay.gf
index e15b044f..f9f28d14 100644
--- a/src/malay/LexiconMay.gf
+++ b/src/malay/LexiconMay.gf
@@ -320,7 +320,8 @@ lin sell_V3 = mkV3 (mkV "jual" Meng) emptyPrep emptyPrep ; -- TODO
 -- lin shop_N = mkN "" ;
 -- lin short_A = mkA "" ;
 -- lin silver_N = mkN "" ;
--- lin sing_V = mkV "" ;
+lin sing_V = mkV "nyanyi" ;
+lin sing_V2 = mkV2 "nyanyi" ;
 -- lin sister_N = mkN "" ;
 -- lin sit_V = mkV "" ;
 -- lin skin_N = mkN "" ;
@@ -333,7 +334,7 @@ lin small_A = mkA "kecil" ;
 -- lin snake_N = mkN "" ;
 -- lin snow_N = mkN "" ;
 -- lin sock_N = mkN "" ;
--- lin song_N = mkN "" ;
+lin song_N = mkN "lagu" ;
 -- lin speak_V2 = mkV2 "" ;
 -- lin spit_V = mkV "" ;
 -- lin split_V2 = mkV2 "" ;
diff --git a/src/malay/QuestionMay.gf b/src/malay/QuestionMay.gf
index b7194dc6..3a1f0b2e 100644
--- a/src/malay/QuestionMay.gf
+++ b/src/malay/QuestionMay.gf
@@ -1,9 +1,21 @@
 concrete QuestionMay of Question = CatMay ** open
-  Prelude, ResMay, ParadigmsMay, (VS=VerbMay), (NS=NounMay), (SS=StructuralMay) in {
+  Prelude, ResMay, ParadigmsMay, (VS=VerbMay), (NM=NounMay), (SS=StructuralMay) in {
 
 -- A question can be formed from a clause ('yes-no question') or
 -- with an interrogative.
 
+-- Interrogative pronouns can be formed with interrogative
+-- determiners, with or without a noun.
+lin
+  -- : IDet -> CN -> IP ;       -- which five songs
+  IdetCN idet cn = NM.DetCN idet cn ;
+
+  -- : IDet       -> IP ;       -- which five
+  IdetIP idet = NM.DetNP idet ;
+
+  -- : IQuant -> Num -> IDet ;  -- which (five)
+  IdetQuant = NM.DetQuant ;
+
 {-
   lin
   -- : Cl -> QCl ;
diff --git a/src/malay/StructuralMay.gf b/src/malay/StructuralMay.gf
index 6dcb4417..275137d7 100644
--- a/src/malay/StructuralMay.gf
+++ b/src/malay/StructuralMay.gf
@@ -71,12 +71,12 @@ lin someSg_Det =
 lin no_Quant = -}
 lin that_Quant = mkQuant "itu" ;
 lin this_Quant = mkQuant "ini" ;
-{-lin which_IQuant =
+lin which_IQuant = mkQuant "apa" ;
 
 
 -----
 -- NP
-
+{-
 lin everybody_NP = defNP "" N.NumPl ;
 lin everything_NP = defNP "" N.NumSg ;
 lin nobody_NP = mkVerb; ""
@@ -118,14 +118,14 @@ lin with_Prep = mkPrep "dengan" ;
 -- Pron
 
 -- Pronouns are closed class, no constructor in ParadigmsMay.
-  -- it_Pron =
+lin it_Pron = mkPron "dia" P3 ;
 lin i_Pron = mkPron "saya" P1 ;
--- lin youPol_Pron = mkPron "" P3 ;
--- lin youSg_Pron =
+lin youPol_Pron = mkPron "kamu" P2 ;
+lin youSg_Pron = mkPron "awak" P2 ;
 lin he_Pron = mkPron "dia" P3 ;
 lin she_Pron = mkPron "dia" P3 ;
 lin we_Pron = mkPron "kami" P1 ;
--- lin youPl_Pron =
+lin youPl_Pron = mkPron "kamu" P2;
 lin they_Pron = mkPron "mereka" P3 ;
 
 --lin whatPl_IP = ;