diff --git a/ps-grammar/demoChallenge/commands.jsgf b/ps-grammar/demoChallenge/commands.jsgf
index 45d576050d9167c3d21c010d9b1a7df09da7de7f..e629d0a19640822f5e72fc47021c0b8cc632ad52 100644
--- a/ps-grammar/demoChallenge/commands.jsgf
+++ b/ps-grammar/demoChallenge/commands.jsgf
@@ -2,10 +2,9 @@
 grammar bebot_demo;
 public <statement> = [tobi] [please] <command> [please] [tobi];
 
-<command> = <clean> | <party> | <teach> | <mapping>;
-<clean> = clean up | start cleaning;
-<mapping> = start mapping;
-<party> = [the] party starts | party beginning;
+<command> =  <mapping> | <clean> | <party> | <teach>;
+<clean> = (clean up) | (start cleaning);
+<mapping> = ( start mapping );
+<party> = ( [the] party starts) | (party beginning);
 <teach> = ( (this is [a | an | the] ) | ( these are [the] ) ) <object>;
-<object> = [other] ( trashbin  );
-
+<object> = trashbin;