diff --git a/psGrammar/challenge/team2/bill.jsgf b/psGrammar/challenge/team2/bill.jsgf
index 3d3ad615f1c8a4c41ea1aa46551cf3148afaf165..7543ac4d697b0a3cad9af7d56abb86829d54b465 100644
--- a/psGrammar/challenge/team2/bill.jsgf
+++ b/psGrammar/challenge/team2/bill.jsgf
@@ -1,8 +1,13 @@
 #JSGF V1.0;
 grammar bill;
 public <command> = ( <setupbill> | <thatscorrect> | <correction> );
-<setupbill> = [tiago] [please] (set up the ( bill | check ) | could i have the ( bill | check ) | i ( would like | want ) to pay | can i pay | bill ) [now] [please];
-<thatscorrect> = ( yes | [yes] you got that ( right | correct ) | [yes] that is ( right | correct ) );
-<correction> = [ [no] i ordered | there are ] <drink> [ [and] <drink>] [ [and] <drink>];
 
-<drink> = [ a | one | two | three ] [ bottle of | bottles of | cup of | cups of | can of | cans of] ( coke | malz | lemonade | water | ice tea | coffee );
+<setupbill> = [tiago] [please] (set up the ( bill | check ) | (could i have the) ( bill | check ) | i ( would like | want ) (to pay) | (can i pay) | bill ) [now] [please];
+
+
+<thatscorrect> = ( yes | [yes] (you got that) ( right | correct ) | [yes] (that is) ( right | correct ) );
+
+
+<correction> = [ [no] (i ordered) | (there are) ] <drink> [ [and] <drink>] [ [and] <drink>];
+
+<drink> = [ ( (a | one) [(bottle | cup | can) of] ) | ((two | three) [(bottles | cups | cans) of]) ] ( coke | malz | lemonade | water | ice tea | coffee );