diff --git a/psConfig/tasks/restaurant/restaurant.conf b/psConfig/tasks/restaurant/restaurant.conf
new file mode 100644
index 0000000000000000000000000000000000000000..be044a529db286e9089e589016d7c63bb95ef3b5
--- /dev/null
+++ b/psConfig/tasks/restaurant/restaurant.conf
@@ -0,0 +1,41 @@
+[main]
+startdb=43;
+uttdb=47;
+silence=400;
+timeout=8;
+openDeviceDirectly=yes;
+
+[pocketsphinxinstance]
+name=confirm;
+jsgf=../../psGrammar/confirm/confirm.jsgf;
+rsbscope=/speechrec/psa/confirm;
+bestpath=no;
+autoload=yes;
+
+[pocketsphinxinstance]
+name=ordering;
+jsgf=../../psGrammar/tasks/restaurant/order.jsgf;
+rsbscope=/speechrec/psa/ordering;
+bestpath=no;
+autoload=yes;
+
+[pocketsphinxinstance]
+name=goTable;
+jsgf=../../psGrammar/tasks/restaurant/goTable.jsgf;
+rsbscope=/speechrec/psa/goTable;
+bestpath=no;
+autoload=yes;
+
+[pocketsphinxinstance]
+name=saveTable;
+jsgf=../../psGrammar/tasks/restaurant/saveTable.jsgf;
+rsbscope=/speechrec/psa/saveTable;
+bestpath=no;
+autoload=yes;
+
+[pocketsphinxinstance]
+name=commands;
+jsgf=../../psGrammar/tasks/restaurant/commands.jsgf;
+rsbscope=/speechrec/psa/commands;
+bestpath=no;
+autoload=yes;
diff --git a/psConfig/tasks/restaurant/restaurantOLD.conf b/psConfig/tasks/restaurant/restaurantOLD.conf
new file mode 100644
index 0000000000000000000000000000000000000000..056bbca0a523ed3187118fee4f5a7f07bfc8f5d1
--- /dev/null
+++ b/psConfig/tasks/restaurant/restaurantOLD.conf
@@ -0,0 +1,42 @@
+[main]
+startdb=47;
+uttdb=52;
+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=ordering;
+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/restaurant/ordering.jsgf;
+rsbscope=/speechrec/psa/ordering;
+bestpath=no;
+autoload=yes;
+
+[pocketsphinxinstance]
+name=saveCommand;
+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/restaurant/saveCommand.jsgf;
+rsbscope=/speechrec/psa/saveCommand;
+bestpath=no;
+autoload=yes;
+
+[pocketsphinxinstance]
+name=otherCommand;
+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/restaurant/otherCommand.jsgf;
+rsbscope=/speechrec/psa/otherCommand;
+bestpath=no;
+autoload=yes;
diff --git a/psGrammar/tasks/restaurant/.order.jsgf.kate-swp b/psGrammar/tasks/restaurant/.order.jsgf.kate-swp
new file mode 100644
index 0000000000000000000000000000000000000000..738627be8ae553857d9420819f291b70c6c2f07e
Binary files /dev/null and b/psGrammar/tasks/restaurant/.order.jsgf.kate-swp differ
diff --git a/psGrammar/tasks/restaurant/commands.jsgf b/psGrammar/tasks/restaurant/commands.jsgf
new file mode 100644
index 0000000000000000000000000000000000000000..6b556526ec73eaee6344d57abd7dd32f592237c7
--- /dev/null
+++ b/psGrammar/tasks/restaurant/commands.jsgf
@@ -0,0 +1,9 @@
+#JSGF V1.0;
+grammar restaurant_save_command;
+
+public <restaurant> = [tobi] [please] (<followMe> | <stop> | <place> | <table>);
+<followMe> = ((follow me) | (come [(with me) | here]) | (keep up));
+<stop> = (stop [this]);
+<place> = (save (place | location));
+<table> = (this [is] table <number>);
+<number> = (one | two | three);
diff --git a/psGrammar/tasks/restaurant/goTable.jsgf b/psGrammar/tasks/restaurant/goTable.jsgf
new file mode 100644
index 0000000000000000000000000000000000000000..5a63408df25635d362e4aaca57927d17d8890adb
--- /dev/null
+++ b/psGrammar/tasks/restaurant/goTable.jsgf
@@ -0,0 +1,6 @@
+#JSGF V1.0;
+grammar restaurant_save_command;
+
+public <restaurant> = [tobi] [please] [(take a oder from) | (go to)] <deliveryLocations> [please];
+<deliveryLocations> = (table <numberOfTable>);
+<numberOfTable> = (one | two | three | four | five | six | seven | eight | nine);
\ No newline at end of file
diff --git a/psGrammar/tasks/restaurant/old/ordering.jsgf b/psGrammar/tasks/restaurant/old/ordering.jsgf
new file mode 100644
index 0000000000000000000000000000000000000000..5fdc54d0b534afb11fddcdc48a71a70ba876a699
--- /dev/null
+++ b/psGrammar/tasks/restaurant/old/ordering.jsgf
@@ -0,0 +1,13 @@
+#JSGF V1.0;
+grammar restaurant_ordering;
+
+public <restaurant> = ([tobi] [please] bring <objects> to <deliveryLocations>);
+
+<deliveryLocations> = (table <numberOfTable>);
+
+<numberOfTable> = (one | two | three | four | five | six | seven | eight | nine);
+
+<objects> = (<drinks> | <snacks>);
+
+<drinks> = (orange juice) | beer | cola | (chocolate milk) | (energy drink) | (grape juice) | milk | water;
+<snacks> = (chocolate cookies) | chips | biscuits | bread | pringles | (strawberry cookies);
diff --git a/psGrammar/tasks/restaurant/old/saveCommand.jsgf b/psGrammar/tasks/restaurant/old/saveCommand.jsgf
new file mode 100644
index 0000000000000000000000000000000000000000..30cf8e4b3a7cb8d1ea8c6c45f948dc031b1efc42
--- /dev/null
+++ b/psGrammar/tasks/restaurant/old/saveCommand.jsgf
@@ -0,0 +1,11 @@
+#JSGF V1.0;
+grammar restaurant_save_command;
+
+public <restaurant> = ([tobi] [please] save ( <deliveryLocations> | <objectCategory> ) [[to | on] [the | my]] ( <savePlaceLeft> | <savePlaceRight> | <savePlaceFront> | <savePlaceBack> ));
+<savePlaceFront> = front;
+<savePlaceBack> = back;
+<savePlaceLeft> = left;
+<savePlaceRight> = right;
+<deliveryLocations> = (table <numberOfTable>);
+<numberOfTable> = (one | two | three);
+<objectCategory> = (drinks | snacks);
diff --git a/psGrammar/tasks/restaurant/order.jsgf b/psGrammar/tasks/restaurant/order.jsgf
new file mode 100644
index 0000000000000000000000000000000000000000..d387465fd6175d3891aa0f7e6f899383879a3765
--- /dev/null
+++ b/psGrammar/tasks/restaurant/order.jsgf
@@ -0,0 +1,12 @@
+#JSGF V1.0;
+grammar restaurant_ordering;
+
+public <restaurant> = ([tobi] [bring me] [one | a ] <objects> [please]);
+
+<objects> = (<drinks> | <combo>);
+<combo> = (<item> (and | with) <item>);
+<item> = (<snacks> | <food>);
+
+<drinks> = ((green tea) | (papaya milk) | (pure milk) | water | (orange juice) | (beer));
+<food> = ((coconut cereals) | (coco balls) | (egg stars) | (gram soup) | (bean sauce) | (apple) | (lemon) | (pear));
+<snacks> = ((biscuits) | (bubble gum) | (chocolates) | (tomato chips) | (barbeque chips) | (honey chips));
\ No newline at end of file
diff --git a/psGrammar/tasks/restaurant/saveTable.jsgf b/psGrammar/tasks/restaurant/saveTable.jsgf
new file mode 100644
index 0000000000000000000000000000000000000000..d9b33a4981ee66af94417e31e2bfb2f6eb58caad
--- /dev/null
+++ b/psGrammar/tasks/restaurant/saveTable.jsgf
@@ -0,0 +1,10 @@
+#JSGF V1.0;
+grammar restaurant_save_command;
+
+public <restaurant> = [tobi] [please] [save] ( <deliveryLocations> ) [[to | on] [the | my]] ( <savePlaceLeft> | <savePlaceRight> | <savePlaceFront> | <savePlaceBack> );
+<savePlaceFront> = front;
+<savePlaceBack> = back;
+<savePlaceLeft> = left;
+<savePlaceRight> = right;
+<deliveryLocations> = table <numberOfTable>;
+<numberOfTable> = (one | two | three | four | five | six | seven | eight | nine);
\ No newline at end of file