diff --git a/pocketsphinxAdapter/grammar/gprs/gprs.jsgf b/pocketsphinxAdapter/grammar/gprs/gprs.jsgf
index 4dda2c6e93e34f31a87884c908643a80856a1485..ed375d5805c430447a4a85495191fac02ae545e2 100644
--- a/pocketsphinxAdapter/grammar/gprs/gprs.jsgf
+++ b/pocketsphinxAdapter/grammar/gprs/gprs.jsgf
@@ -4,11 +4,11 @@ public <task> = [tobi] [(would | could) you] [please] <command> [please] [tobi];
 
 <command> = <bring_command> | <goto_command> | <follow_command> | <find_command> | <put_command> | <learn_command>;
 
-<bring_command> = <bringVerb> [<person>] [<article>] <grab_object> [from | into | to] [<article>] [<location> | <person>] [(to|into) [<article>] <second_location>];
-<goto_command> = <gotoVerb> <preposition> <location>;
+<bring_command> = <bringVerb> [<person>] [<article>] <grab_object> <preposition> [<article>] [<location> | <person>] [(to|into) [<article>] <second_location>];
+<goto_command> = <gotoVerb> [<further_preposition> | <preposition>] <location>;
 <follow_command> = <followVerb> <person>;
 <find_command> = <findVerb> [<article>] (<grab_object> | <person>) [in <location>];
-<put_command> = <putVerb> <grab_object> <preposition> <location>;
+<put_command> = <putVerb> <grab_object> [<further_preposition> | <preposition>] <location>;
 <learn_command> = <learnVerb> [<article>] (<person> | <location>);
 <cleanUp_command> = <cleanUpVerb> <article> <room_class>;
 
@@ -42,6 +42,7 @@ public <task> = [tobi] [(would | could) you] [please] <command> [please] [tobi];
 <door_class> = exit | entry;
 <room_class> = kitchen | living_room | bed_room | hallway;
 <utensil_class> = hanger | umbrella_stand | trash_bin | plant;
-<preposition> = into | (on [top of]) | in | ([next] to) | at | near | from;
+<preposition> = into | to | from;
+<further_preposition> = (on [top of]) | in | (next to) | at | near;
 
 <article> = the | an | a | some | this;