diff --git a/ps-config/demoChallenge/demoChallenge.conf b/ps-config/demoChallenge/demoChallenge.conf
new file mode 100644
index 0000000000000000000000000000000000000000..3670aacd3b7fe036a8d5a8eeb759715709cb72d5
--- /dev/null
+++ b/ps-config/demoChallenge/demoChallenge.conf
@@ -0,0 +1,24 @@
+[main]
+startdb=30;
+uttdb=35;
+silence=400;
+timeout=8;
+openDeviceDirectly=yes;
+
+[pocketsphinxinstance]
+name=confirm;
+hmm=/vol/robocup/2013/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
+dict=/vol/robocup/2013/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2013/share/SpeechRec/psGrammar/confirm/confirm.jsgf;
+rsbscope=/speechrec/psa/confirm;
+bestpath=no;
+autoload=yes;
+
+[pocketsphinxinstance]
+name=commands;
+hmm=/vol/robocup/2013/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
+dict=/vol/robocup/2013/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2013/share/SpeechRec/psGrammar/demoChallenge/commands.jsgf;
+rsbscope=/speechrec/psa/commands;
+bestpath=no;
+autoload=yes;
diff --git a/ps-config/robotZoo/roboZoo.conf b/ps-config/robotZoo/roboZoo.conf
index 5d86ad88aab81b1a061e818b566552455b20bc08..6c2336d17cdff68aa146f84d249bbb10fea599b5 100644
--- a/ps-config/robotZoo/roboZoo.conf
+++ b/ps-config/robotZoo/roboZoo.conf
@@ -22,3 +22,12 @@ jsgf=/vol/robocup/2013/share/SpeechRec/psGrammar/robotZoo/roboZoo.jsgf;
 rsbscope=/speechrec/psa/roboZoo;
 bestpath=no;
 autoload=yes;
+
+[pocketsphinxinstance]
+name=person;
+hmm=/vol/robocup/2013/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
+dict=/vol/robocup/2013/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2013/share/SpeechRec/psGrammar/person/person.jsgf;
+rsbscope=/speechrec/psa/person;
+bestpath=no;
+autoload=yes;
diff --git a/ps-grammar/demoChallenge/commands.jsgf b/ps-grammar/demoChallenge/commands.jsgf
new file mode 100644
index 0000000000000000000000000000000000000000..512cf62538d6d4bbe49414ae6216592deeccdd5d
--- /dev/null
+++ b/ps-grammar/demoChallenge/commands.jsgf
@@ -0,0 +1,7 @@
+#JSGF V1.0;
+grammar bebot_demo;
+public <statement> = [tobi] [please] <command> [please] [tobi];
+
+<command> = <clean>;
+<clean> = clean up | start cleaning;
+
diff --git a/ps-grammar/robotZoo/roboZoo.jsgf b/ps-grammar/robotZoo/roboZoo.jsgf
index c8f2bef5a593957970a20b83fb7960bbb234803d..9a498a49826953ca17dc34bb1bae07dd3ce7420d 100644
--- a/ps-grammar/robotZoo/roboZoo.jsgf
+++ b/ps-grammar/robotZoo/roboZoo.jsgf
@@ -1,7 +1,7 @@
 #JSGF V1.0;
 grammar ToBI_roboZoo;
 
-public <statement> = [tobi] (<biron> | <andi> | <leon> | <kai> | <martin> | <christian> | <leroy> | <suchit> | <niksa> | <sven> | <sebastian> | <timo> ) [tobi];
+public <statement> = [tobi] (<biron> | <andi> | <leon> | <kai> | <martin> | <christian> | <leroy> | <suchit> | <niksa> | <sven> | <sebastian> | <timo> | <team>) [tobi];
 
 <biron> =  biron;
 <andi> = andreas; 
@@ -15,3 +15,4 @@ public <statement> = [tobi] (<biron> | <andi> | <leon> | <kai> | <martin> | <chr
 <niksa> = niksa;
 <sven> = sven;
 <timo> = timo;
+<team> = team | whole;