diff --git a/ps-grammar/basicFunctionalities/basicFunctionalities.jsgf b/ps-grammar/basicFunctionalities/basicFunctionalities.jsgf
index accab8afeb2a3aa488e036ea76540e19fc4bebb3..77d40c89cf734db39955b44757a7b5130f987570 100644
--- a/ps-grammar/basicFunctionalities/basicFunctionalities.jsgf
+++ b/ps-grammar/basicFunctionalities/basicFunctionalities.jsgf
@@ -2,8 +2,8 @@
 grammar basicFunctionalities;
 
 public <basicFunctionalities> = <question1> | <question2> | <question3> | <question4> | <question5> | <question6> | <question7> | <question8> | <question9> | <question10> | <startServing> | <stop>;
-<startServing> = continue;
-<stop> = stop;
+<startServing> = continue | tobi continue;
+<stop> = tobi stop;
 <question1> = question one;
 <question2> = question two;
 <question3> = question three;
diff --git a/ps-grammar/basicFunctionalities/basicFunctionalities.jsgf~ b/ps-grammar/basicFunctionalities/basicFunctionalities.jsgf~
index 485fff527742d98187bf772cb59136c4d959cc28..accab8afeb2a3aa488e036ea76540e19fc4bebb3 100644
--- a/ps-grammar/basicFunctionalities/basicFunctionalities.jsgf~
+++ b/ps-grammar/basicFunctionalities/basicFunctionalities.jsgf~
@@ -1,9 +1,16 @@
 #JSGF V1.0;
 grammar basicFunctionalities;
 
-public <basicFunctionalities> = <question1> | <question2> | <startServing> | <stop>;
+public <basicFunctionalities> = <question1> | <question2> | <question3> | <question4> | <question5> | <question6> | <question7> | <question8> | <question9> | <question10> | <startServing> | <stop>;
 <startServing> = continue;
 <stop> = stop;
-<question1> = what is your name;
-<question2> = how old are you;
-
+<question1> = question one;
+<question2> = question two;
+<question3> = question three;
+<question4> = question four;
+<question5> = question five;
+<question6> = question six;
+<question7> = question seven;
+<question8> = question eight;
+<question9> = question nine;
+<question10> = question ten;