diff --git a/pocketsphinxAdapter/grammar/gprs/gprs.jsgf b/pocketsphinxAdapter/grammar/gprs/gprs.jsgf
index cc0ada3e75fb4a1d7b3a2063bf9a511b7956eba0..e52abad34cf5678cf5ccd1cf4bcfda8ff743ceb6 100644
--- a/pocketsphinxAdapter/grammar/gprs/gprs.jsgf
+++ b/pocketsphinxAdapter/grammar/gprs/gprs.jsgf
@@ -38,6 +38,6 @@ 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> = (on [top of]) | in | ([next] to) | at | near | in | into | from;
+<preposition> = into | (on [top of]) | in | ([next] to) | at | near | from;
 
 <article> = the | an | a | some | this;
diff --git a/pocketsphinxAdapter/grammar/location/location.jsgf b/pocketsphinxAdapter/grammar/location/location.jsgf
index 5d1acb432dd907be14f297155644c56731f58129..cfe5a03ffc4f4ce34cddc48b65128a1ea17dd428 100644
--- a/pocketsphinxAdapter/grammar/location/location.jsgf
+++ b/pocketsphinxAdapter/grammar/location/location.jsgf
@@ -6,7 +6,7 @@ public <statement> = <locationPhrase> [please];
 
 <verb> = go | search | learn | remember | memorize;
 
-<location> = <appliance_class> | <shelf_class> | <seat_class> | <table_class> | <room_class> | <utensil_class> | seating | utensil | location | room | appliance | shelf | seat | table | somewhere;
+<location> = <appliance_class> | <shelf_class> | <seat_class> | <table_class> | <room_class> | <utensil_class> | <door_class> | door | seating | utensil | location | room | appliance | shelf | seat | table | somewhere;
 
 <appliance_class> = stove | sink | fridge | tv_counter;
 <shelf_class> = bar | kitchen_counter | cupboard | dresser | side_board | book_shelf | pantry | cabinet;
@@ -15,4 +15,5 @@ public <statement> = <locationPhrase> [please];
 <table_class> = hallway_table | side_table | kitchen_table | dinner_table | couch_table | bedsidetable;
 <room_class> = kitchen | living_room | bed_room | hallway;
 <utensil_class> = hanger | umbrella_stand | trash_bin | plant;
-<preposition> = (on [top of]) | in | ([next] to) | at | near | in | into | from;
+<door_class> = exit | entry;
+<preposition> = into | (on [top of]) | in | ([next] to) | at | near | in | from;