diff --git a/src/basque/IdiomEus.gf b/src/basque/IdiomEus.gf
index 16d586413..a47537754 100644
--- a/src/basque/IdiomEus.gf
+++ b/src/basque/IdiomEus.gf
@@ -32,7 +32,7 @@ concrete IdiomEus of Idiom = CatEus ** open Prelude, ResEus, VerbEus in {
   ProgrVP vp = vp ** { prc = \\tns => vp.prc ! Pres ++ "ari" } ;
 
   -- : VP -> Utt ;       -- let's go
-  ImpPl1 vp = { s = linVPPrc vp } ;
+  ImpPl1 vp = { s = linVPPrc vp ! Gu } ;
 {-
 
     ImpP3     : NP -> VP -> Utt ; -- let John walk
diff --git a/src/basque/PhraseEus.gf b/src/basque/PhraseEus.gf
index 8c05e92b4..9e8274cf8 100644
--- a/src/basque/PhraseEus.gf
+++ b/src/basque/PhraseEus.gf
@@ -16,7 +16,7 @@ concrete PhraseEus of Phrase = CatEus ** open Prelude, ResEus in {
     UttIP ip = { s = ip.s ! Abs} ;
     UttIAdv iadv = iadv ;
     UttNP np = { s = np.s ! Abs} ;
-    UttVP vp = { s = linVPPrc vp } ;
+    UttVP vp = { s = linVPPrc vp ! Hau } ;
     UttAdv adv = adv ;
     UttCN n = {s = linCNDef n } ;
     UttCard n = n ;
diff --git a/src/basque/ResEus.gf b/src/basque/ResEus.gf
index e9ec50d21..b7990ec19 100644
--- a/src/basque/ResEus.gf
+++ b/src/basque/ResEus.gf
@@ -385,9 +385,9 @@ oper
     ++ (verb.aux ! Hau).indep ;
 
   -- Used in ComplVV : does not include aux!
-  linVPPrc : VerbPhrase -> Str = \vp ->  --TODO make it less of a hack.
-    vp.adv 
-    ++ vp.iobj.s ++ vp.dobj.s ! Pos ++ vp.comp ! Hau  --all the compls!
+  linVPPrc : VerbPhrase -> Agr => Str = \vp ->
+    \\agr => vp.adv
+    ++ vp.iobj.s ++ vp.dobj.s ! Pos ++ vp.comp ! agr  --all the compls!
     ++ vp.prc ! Past ; --If we choose Past, then it will work with Jakin ...
                       
 
diff --git a/src/basque/SentenceEus.gf b/src/basque/SentenceEus.gf
index 8501afc51..b11a763a6 100644
--- a/src/basque/SentenceEus.gf
+++ b/src/basque/SentenceEus.gf
@@ -35,7 +35,7 @@ lin
 
 --2 Imperatives
   -- : VP -> Imp ; 
- ImpVP vp = { s = linVPPrc vp } ; --TODO: check negation
+ ImpVP vp = { s = linVPPrc vp ! Hau } ; --TODO: check negation
 
 --2 Embedded sentences
 
@@ -47,7 +47,7 @@ lin
   EmbedQS qs = { s = linSSub (qs.s ! Indir) "la" } ; --???
 
   -- : VP -> SC ;                     -- ikusi
-  EmbedVP vp = { s = linVPPrc vp } ;
+  EmbedVP vp = { s = linVPPrc vp ! Hau } ;
 
 --2 Sentences
 
diff --git a/src/basque/VerbEus.gf b/src/basque/VerbEus.gf
index 3c789ab7e..0462db24a 100644
--- a/src/basque/VerbEus.gf
+++ b/src/basque/VerbEus.gf
@@ -10,7 +10,7 @@ lin
 
   -- : VV  -> VP -> VP ;  -- [lo egin/neska ikusi/jakin] nahi/ahal/behar dut
   ComplVV vv vp = 
-    let vcomp : Str = linVPPrc vp ;
+    let vcomp = linVPPrc vp ;
     in ResEus.insertComp vcomp (useV vv) ;
 
 
@@ -51,8 +51,8 @@ lin
 
 
   -- : V2V -> VP -> VPSlash ;  -- beg (her) to go
-  SlashV2V v2v vp = slashDObj v2v **   -- TODO: something wrong in this function!
-    { comp = \\agr => linVPPrc vp } ; --How about agreement with tense of the main clause???
+  SlashV2V v2v vp = slashDObj v2v ** 
+    { comp = linVPPrc vp } ; ---- No agreement with tense of the main clause
     
 
   -- : V2S -> S  -> VPSlash ;  -- answer (to him) that it is good