diff --git a/psConfig/challenge/team2/configTeam2.conf b/psConfig/challenge/team2/configTeam2.conf
index 4e9d010b084094886e6b335e70f8694a7ff7aed2..f46529551fac0b10f086c1e03bb6a95ff01c00e4 100644
--- a/psConfig/challenge/team2/configTeam2.conf
+++ b/psConfig/challenge/team2/configTeam2.conf
@@ -25,3 +25,10 @@ jsgf=../../psGrammar/challenge/team2/table.jsgf;
 rsbscope= /speechrec/psa/table;
 bestpath=no;
 autoload=yes;
+
+[pocketsphinxinstance]
+name=table;
+jsgf=../../psGrammar/challenge/team2/task5.jsgf;
+rsbscope= /speechrec/psa/task5;
+bestpath=no;
+autoload=yes;
diff --git a/psGrammar/challenge/team2/task5.jsfg b/psGrammar/challenge/team2/task5.jsfg
new file mode 100644
index 0000000000000000000000000000000000000000..ebb1b34662adbf6680e4eabede6b24a2e11b52ef
--- /dev/null
+++ b/psGrammar/challenge/team2/task5.jsfg
@@ -0,0 +1,19 @@
+#JSGF V1.0;
+grammar task5;
+
+public <command> = [yes] <robot> [please] <command1> [please];
+
+<command1> = (<toBathroom> | <toCashRegister> | <toTableA> | <toTableB> | <toTableC> ) ;
+<robot> = (tiago | tobi);
+
+<toBathroom> = ([bring me] [to] [the] <bathroom> | I want to go to the <bathroom> | where is the <bathroom> |where [can] [do] I find the <bathroom>);
+<bathroom> = (bathroom | toilet);
+
+<toCashRegister> = ([bring me] [to] [the] <cashRegister> | I want to go to the <cashRegister> | where is the <cashRegister> | where [can] [do] I find the <cashRegister>);
+<cashRegister> = (cashier | [cash] register);
+
+<toTableA> = ([bring me] [to] table A | I want to go to table A | where is table A | where [can] [do] I find table A);
+<toTableB> = ([bring me] [to] table B | I want to go to table B | where is table B | where [can] [do] I find table B);
+<toTableC> = ([bring me] [to] table C | I want to go to table C | where is table C | where [can] [do] I find table C);
+
+