diff --git a/psGrammar/exercise/team_hypnodisc/takeOrder.jsgf b/psGrammar/exercise/team_hypnodisc/takeOrder.jsgf
index 57e46373757bba4ec0b0d7aa41a9e7db9397d128..91567c5182f97541ce78403531f32cb36b6a0858 100644
--- a/psGrammar/exercise/team_hypnodisc/takeOrder.jsgf
+++ b/psGrammar/exercise/team_hypnodisc/takeOrder.jsgf
@@ -1,6 +1,7 @@
 #JSGF V1.0;
 grammar ToBI_takeOrder;
-public <order> = [tobi] <cmd> [tobi];
-<cmd> = ([i <wount> [to order]] | bring me a | i want a) <drink>;
+public <order> = [<robot>] <cmd> [<robot>];
+<robot> = (tobi | biron | robot);
+<cmd> = [((i <wount> [to order]) | ((bring | fetch) me))] [a] <drink>;
 <wount> = ( would like | want );
 public <drink> = ( coke | beer | pringles );