diff --git a/psGrammar/tasks/gpsr/gpsr23.jsgf b/psGrammar/tasks/gpsr/gpsr23.jsgf
index 9417fe5420fcc2ea7161a8fbfbf465ec88dffc80..5d0f4feca6313fc1ea21b8c368c6b741c1bc860d 100644
--- a/psGrammar/tasks/gpsr/gpsr23.jsgf
+++ b/psGrammar/tasks/gpsr/gpsr23.jsgf
@@ -13,7 +13,7 @@ public <sentence> 		= [could you | robot | tobi | tiago] [please] <command>;
 <cmdguide> 			= <guideNameFromBeacToBeac> | (<meetPrsAtBeac> and <guidePronToBeacon>) | (<goToLoc> <meetName> and <guidePronToBeacon>) | <guideNameToBeacFindAtBeac>;
 
 
-<cmdfollow> 			= <followNameFromBeacToRoom> | (<meetPrsAtBeac> and (<followPrs> | <followPrsToRoom>)) | (<goToLoc> <meetName> and (<followPrs> | <followPrsToRoom>));
+<cmdfollow> 			= <followNameFromBeacToRoom> | (<meetPrsAtBeac> and <followPrsToRoom>) | (<goToLoc> <meetName> and (<followPrs> | <followPrsToRoom>));
 
 <cmdfollowout> 		= <meetPrsAtBeac> <followPrs> and (<goToLoc> | <guidePronBack>);
 
@@ -171,12 +171,12 @@ public <sentence> 		= [could you | robot | tobi | tiago] [please] <command>;
 <N_posture> 			= sitting | standing | lying down;
 <N_three>           = three;
 
-<N_object>                  	= (tray) | (basket) | (bag) | sponge | cleanser | (red wine) | (juice pack) | (cola) | (tropical juice) | (milk) | (iced tea) | (orange juice) | (tuna) | (tomato soup) | spam | mustard | (strawberry jello) | (chocolate jello) | (coffee grounds) | sugar | pear | plum | peach | lemon | orange | strawberry | banana | apple | (tennis ball) | (soccer ball) | (rubiks cube) | dice | baseball | pringles | cornflakes | cheezit | spoon | plate | cup | fork | bowl | knife;
-<N_category>                	= containers | (cleaning supplies) | drinks | food | fruits | toys | snacks | dishes;
+<N_object>                  	= sponge | cleanser | (red wine) | (juice pack) | (cola) | (tropical juice) | (milk) | (iced tea) | (orange juice) | (tuna) | (tomato soup) | spam | mustard | (strawberry jello) | (chocolate jello) | (coffee grounds) | sugar | pear | plum | peach | lemon | orange | strawberry | banana | apple | (tennis ball) | (soccer ball) | (rubiks cube) | dice | baseball | pringles | cornflakes | cheezit | spoon | plate | cup | fork | bowl | knife;
+<N_category>                	= (cleaning supplies) | drinks | food | fruits | toys | snacks | dishes;
 <N_room>                    	= kitchen | (living room) | bedroom | study;
 <N_roomTwo> 			= kitchen | (living room) | bedroom | study;
-<N_placement>               	= (bedside table) | shelf | trashbin | dishwasher | kitchen table | pantry | cabinet | desk | (tv stand) | (storage rack) | (bookshelf) | (side tables);
-<N_placementTwo>            	= (bedside table) | shelf | trashbin | dishwasher | kitchen table | pantry | cabinet | desk | (tv stand) | (storage rack) | (bookshelf) | (side tables);
+<N_placement>               	= (bedside table) | shelf | trashbin | dishwasher | kitchen table | pantry | cabinet | desk | (tv stand) | (storage rack) | (bookshelf) | (side tables) | sink;
+<N_placementTwo>            	= (bedside table) | shelf | trashbin | dishwasher | kitchen table | pantry | cabinet | desk | (tv stand) | (storage rack) | (bookshelf) | (side tables) | sink;
 <N_beacon>                  	= (bedside table) | shelf | trashbin | dishwasher | kitchen table | pantry | cabinet | desk | (tv stand) | (storage rack) | (bookshelf) | bed | (potted plant) | chairs | refrigerator | sink | coatrack | armchair | (desk lamp) | lamp | (side tables) | (sofa) | exit | entrance;
 <N_beaconTwo>               	= (bedside table) | shelf | trashbin | dishwasher | kitchen table | pantry | cabinet | desk | (tv stand) | (storage rack) | (bookshelf) | bed | (potted plant) | chairs | refrigerator | sink | coatrack | armchair | (desk lamp) | lamp | (side tables) | (sofa) | exit | entrance;
 <N_name>                    	= adel | angel | axel | charlie | jane | john | jules | morgan | paris | robin | simone;