diff --git a/ps-config/exercise/climberg.conf b/ps-config/exercise/climberg.conf
new file mode 100644
index 0000000000000000000000000000000000000000..a0210ed6bbb15c36f1401ac94e5c2d467d60c71a
--- /dev/null
+++ b/ps-config/exercise/climberg.conf
@@ -0,0 +1,24 @@
+[main]
+startdb=43;
+uttdb=47;
+silence=400;
+timeout=8;
+openDeviceDirectly=yes;
+
+[pocketsphinxinstance]
+name=confirm;
+hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/confirm/confirm.jsgf;
+rsbscope=/speechrec/psa/confirm;
+bestpath=no;
+autoload=yes;
+
+[pocketsphinxinstance]
+name=hc;
+hmm=/vol/robocup/2014/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
+dict=/vol/robocup/2014/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2014/share/SpeechRec/psGrammar/homecoming/hc.jsgf;
+rsbscope=/speechrec/psa/homecoming;
+bestpath=no;
+autoload=yes;
diff --git a/ps-config/kgardeja/kgardeja.conf b/ps-config/kgardeja/kgardeja.conf
index a0ac956fbf6d1c51cd4448738f6ce6d2efb8b304..f20012a5ea71df883800f4c15cd9d250e024bfd5 100644
--- a/ps-config/kgardeja/kgardeja.conf
+++ b/ps-config/kgardeja/kgardeja.conf
@@ -73,6 +73,6 @@ name=kgardeja;
 hmm=../../../pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
 dict=../../psGrammar/dictionary/tobiDic.dic;
 jsgf=../../psGrammar/kgardeja/kgardeja.jsgf;
-rsbscope=/speechrec/psa/controlExecution;
+rsbscope=/speechrec/psa/kgardeja;
 bestpath=no;
 autoload=yes;
diff --git a/ps-grammar/exercise/climberg.jsgf b/ps-grammar/exercise/climberg.jsgf
new file mode 100755
index 0000000000000000000000000000000000000000..94c9dd5e85ec13503e4219db43076aebf75cc811
--- /dev/null
+++ b/ps-grammar/exercise/climberg.jsgf
@@ -0,0 +1,7 @@
+#JSGF V1.0;
+grammar climberg;
+public <statement> = ( <kitchen> | <livingroom>);
+
+<kitchen> = kitchen;
+<livingroom> = livingroom;
+
diff --git a/ps-grammar/kgardeja/kgardeja.jsgf b/ps-grammar/kgardeja/kgardeja.jsgf
index 46e39e36718ca6f189146ac606f56231f3e2fc1f..a665cc942d338142c41f1f15d25c5d615ea02fc5 100644
--- a/ps-grammar/kgardeja/kgardeja.jsgf
+++ b/ps-grammar/kgardeja/kgardeja.jsgf
@@ -1,8 +1,11 @@
 #JSGF V1.0;
 grammar kgardeja;
-public <statement> = <kitchen> | <livingroom> | <accept>;
+public <statement> = <kitchen> | <livingroom> | <accept> | <cleankitchen> | <cleanlivingroom> | <decline>;
 <kitchen> = kitchen;
 <livingroom> = livingroom;
 <accept> = yes;
+<cleankitchen> = clean kitchen;
+<cleanlivingroom> = clean livingroom;
+<decline> = no;