diff --git a/ps-grammar/restaurant/command.jsgf b/ps-grammar/restaurant/command.jsgf
deleted file mode 100644
index 1eebd9386c26f8b41d051620b47e7982fc3c1fde..0000000000000000000000000000000000000000
--- a/ps-grammar/restaurant/command.jsgf
+++ /dev/null
@@ -1,12 +0,0 @@
-#JSGF V1.0;
-grammar restaurant_command;
-
-public <restaurant> = [tobi] [please] <command> [please] [tobi];
-<command> = <followMe> | <stop> | <ordering> | <savePlaceLeft> | <savePlaceRight> | <savePlace>;
-<followMe> = (follow me) | (come [(with me) | here]) | (keep up);
-<stop> = stop [this];
-<ordering> = ordering;
-<savePlaceLeft> = left;
-<savePlaceRight> = right;
-<savePlace> = <save>;
-<save> = save [the] (place | location) [[to | on] [the | my] (<savePlaceRight> | <savePlaceLeft>)];
diff --git a/ps-grammar/restaurant/location.jsgf b/ps-grammar/restaurant/location.jsgf
deleted file mode 100644
index b1b49f78e4ff8bd11faea0f44b030273168ce02b..0000000000000000000000000000000000000000
--- a/ps-grammar/restaurant/location.jsgf
+++ /dev/null
@@ -1,8 +0,0 @@
-#JSGF V1.0;
-grammar restaurant_location;
-
-public <restaurant> = [tobi] [please] <command> [please] [tobi];
-<command> = <objectCategory> | <deliveryLocations>;
-
-<deliveryLocations> = table (one | two | three);
-<objectCategory> = drinks | snacks;
diff --git a/ps-grammar/restaurant/object.jsgf b/ps-grammar/restaurant/object.jsgf
deleted file mode 100644
index 8e42f447924ca437e2a63701c914fc3582b213a2..0000000000000000000000000000000000000000
--- a/ps-grammar/restaurant/object.jsgf
+++ /dev/null
@@ -1,9 +0,0 @@
-#JSGF V1.0;
-grammar restaurant_object;
-
-public <restaurant> = [tobi] [please] <command> [please] [tobi];
-<command> = <objects>;
-<objects> = <drinks> | <snacks>;
-
-<drinks> = (orange juice) | (fruit juice) | (ice tea) | coffee | beer;
-<snacks> = chocolates | (chewing gum) | peanuts;
diff --git a/ps-grammar/restaurant/ordering.jsgf b/ps-grammar/restaurant/ordering.jsgf
index b06003b1dd36f68f73d45d2653bd070e5f0ebabd..5e26a10dda8e9ccf74a13e1f0b7a0b57026a0043 100644
--- a/ps-grammar/restaurant/ordering.jsgf
+++ b/ps-grammar/restaurant/ordering.jsgf
@@ -10,4 +10,4 @@ public <restaurant> = [tobi] [please] bring <objects> to <deliveryLocations>;
 <objects> = <drinks> | <snacks>;
 
 <drinks> = (orange juice) | (fruit juice) | (ice tea) | coffee | beer;
-<snacks> = chocolates | (chewing gum) | peanuts;
+<snacks> = chocolates | (chewing gum) | peanuts | apple;
diff --git a/ps-grammar/restaurant/restaurant.jsgf b/ps-grammar/restaurant/restaurant.jsgf
deleted file mode 100644
index ccd78a23d14a9e9acac535626ef6bb05e38960de..0000000000000000000000000000000000000000
--- a/ps-grammar/restaurant/restaurant.jsgf
+++ /dev/null
@@ -1,20 +0,0 @@
-#JSGF V1.0;
-grammar ToBI_restaurant;
-public <restaurant> = [tobi] [please] <command> [please] [tobi];
-<command> = <followMe> | <stop> | <beverages> | <ordering> | <deliveryLocations> | <savePlaceLeft> | <savePlaceRight> | <savePlace>;
-
-<followMe> = (follow me) | (come [(with me) | here]) | (keep up);
-<stop> = stop [this];
-<beverages> = <objectCategory> | <objects>;
-<objectCategory> = drinks | snacks;
-<objects> = <drinks> | <snacks>;
-
-<drinks> = (orange juice) | (fruit juice) | (ice tea) | coffee | beer;
-<snacks> = chocolates | (chewing gum) | peanuts;
-
-<ordering> = ordering;
-<deliveryLocations> = table (one | two | three);
-<savePlaceLeft> = left;
-<savePlaceRight> = right;
-<savePlace> = <save>;
-<save> = save [the] (place | location) [[to | on] [the | my] (<savePlaceRight> | <savePlaceLeft>)];
diff --git a/ps-grammar/restaurant/saveCommand.jsgf b/ps-grammar/restaurant/saveCommand.jsgf
index 10fad9be0911efb931c3933cb59ce0c953441026..c9c5b7d72efc6ec662c0808f390dea53c9fceb2b 100644
--- a/ps-grammar/restaurant/saveCommand.jsgf
+++ b/ps-grammar/restaurant/saveCommand.jsgf
@@ -1,7 +1,9 @@
 #JSGF V1.0;
 grammar restaurant_save_command;
 
-public <restaurant> = [tobi] [please] save ( <deliveryLocations> | <objectCategory> ) [[to | on] [the | my] ( <savePlaceLeft> | <savePlaceRight> )];
+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>;