diff --git a/ps-grammar/basicFunctionalities/basicFunctionalities.jsgf b/ps-grammar/basicFunctionalities/basicFunctionalities.jsgf
index fff4f2be0e50107d1bbd0e03ce1e59aa77925e47..9524242a84c546a8736aa1cc128df16630785b9c 100644
--- a/ps-grammar/basicFunctionalities/basicFunctionalities.jsgf
+++ b/ps-grammar/basicFunctionalities/basicFunctionalities.jsgf
@@ -4,8 +4,10 @@ grammar basicFunctionalities;
 public <basicFunctionalities> = <question1> | <question2> | <question3> | <question4> | <question5> | <question6> | <question7> | <question8> | <question9> | <question10> | <continue> | <stop> | <stop_pick_and_place>;
 <continue> = tobi continue | continue;
 <stop> = tobi stop;
-<yes> = tobi yes | yes;
-<no> = tobi no | no;
+<yes> = <tobi_yes> | yes;
+<no> = <tobi_no> | no;
+<tobi_yes> = tobi yes;
+<toni_no> = tobi no;
 <stop_pick_and_place> = stop pick and place;
 <question1> = what time is it;
 <question2> = what is your name;