diff --git a/42sh/includes/types.h b/42sh/includes/types.h
index 4ee154f1..bb9e85b5 100644
--- a/42sh/includes/types.h
+++ b/42sh/includes/types.h
@@ -6,7 +6,7 @@
 /*   By: jhalford <jack@crans.org>                  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/12/13 17:11:48 by jhalford          #+#    #+#             */
-/*   Updated: 2017/03/22 17:30:06 by ariard           ###   ########.fr       */
+/*   Updated: 2017/03/22 18:15:19 by ariard           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -196,8 +196,6 @@ enum	e_sym
 	OPEN_FUNC,
 	CLOSE_FUNC,
 	CLOSE_LIST,
-	SEMI_SUBSHELL,
-	SEMI_BRACE,
 	REDIR,
 	CMD,
 	HEREDOCDATA,
diff --git a/42sh/src/parser/aggregate_sym.c b/42sh/src/parser/aggregate_sym.c
index 5e8450bc..fbc02382 100644
--- a/42sh/src/parser/aggregate_sym.c
+++ b/42sh/src/parser/aggregate_sym.c
@@ -6,7 +6,7 @@
 /*   By: ariard <ariard@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2017/03/11 15:58:38 by ariard            #+#    #+#             */
-/*   Updated: 2017/03/22 16:54:58 by ariard           ###   ########.fr       */
+/*   Updated: 2017/03/22 18:13:04 by ariard           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -38,7 +38,8 @@ t_aggrematch		g_aggrematch[] =
 	{TK_DONE, COMPOUND_LIST, DO_GROUP, TK_DO},
 	{TK_ESAC, TK_IN, CASE_CLAUSE, TK_CASE},
 	{TK_ESAC, CASE_LIST_NS, CASE_CLAUSE, TK_CASE},
-	{TK_PAREN_CLOSE, SEMI_SUBSHELL, SUBSHELL, TK_PAREN_OPEN},
+	{TK_PAREN_CLOSE, SUBSHELL, SUBSHELL, TK_PAREN_OPEN},
+//	{TK_PAREN_CLOSE, SEMI_SUBSHELL, SUBSHELL, TK_PAREN_OPEN},
 	{TK_PAREN_CLOSE, COMPOUND_LIST, SUBSHELL, TK_PAREN_OPEN},
 	{TK_PAREN_CLOSE, CMD_SUPERIOR, SUBSHELL, TK_PAREN_OPEN},
 	{TK_PAREN_CLOSE, PIPE_SEMI_SEQUENCE, SUBSHELL, TK_PAREN_OPEN},
@@ -221,9 +222,7 @@ t_aggrematch		g_aggrematch[] =
 	{COMPOUND_LIST, CASE_LIST_NS, CASE_LIST_NS, CASE_LIST_NS},
 	{CLOSE_LIST, PATTERN, CASE_LIST_NS, PATTERN_CASE},
 	{CLOSE_LIST, FUNC_NAME, FUNCTION_DEFINITION, FUNC_NAME},
-	{SUBSHELL, TK_PAREN_OPEN, SEMI_SUBSHELL, 0},
 	{SUBSHELL, ALL, COMPOUND_COMMAND, 0},
-	{BRACE_CLAUSE, TK_LBRACE, SEMI_BRACE, 0},
 	{BRACE_CLAUSE, ALL, COMPOUND_COMMAND, 0},
 	{COMPOUND_COMMAND, FUNC_NAME, COMMAND, FUNC_NAME},
 	{AND_OR_MINOR, PIPE_SEMI_SEQUENCE, AND_OR_MAJOR, PIPE_SEMI_SEQUENCE},
diff --git a/42sh/src/parser/eval_sym.c b/42sh/src/parser/eval_sym.c
index 82db6598..1ebd22ee 100644
--- a/42sh/src/parser/eval_sym.c
+++ b/42sh/src/parser/eval_sym.c
@@ -6,7 +6,7 @@
 /*   By: ariard <ariard@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2017/03/11 16:11:21 by ariard            #+#    #+#             */
-/*   Updated: 2017/03/22 16:56:05 by ariard           ###   ########.fr       */
+/*   Updated: 2017/03/22 18:14:39 by ariard           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -578,7 +578,7 @@ t_stackmatch	g_stackmatch[] =
 	{TK_PAREN_CLOSE, COMPOUND_LIST},
 	{TK_PAREN_CLOSE, FUNC_NAME},
 	{TK_PAREN_CLOSE, OPEN_FUNC},
-	{TK_PAREN_CLOSE, SEMI_SUBSHELL},
+	{TK_PAREN_CLOSE, SUBSHELL},
 	{TK_RBRACE, TK_SEMI},
 	{TK_RBRACE, END_COMMAND},
 	{TK_RBRACE, SEPARATOR_OP},
@@ -1048,7 +1048,6 @@ t_stackmatch	g_stackmatch[] =
 	{SUBSHELL, COMPLETE_CONDITION},
 	{SUBSHELL, CONDITION},
 	{SUBSHELL, AND_OR_MAJOR},
-	{SEMI_SUBSHELL, TK_PAREN_OPEN},
 	{COMPOUND_COMMAND, LINEBREAK},
 	{COMPOUND_COMMAND, TK_PAREN_OPEN},
 	{COMPOUND_COMMAND, TK_LBRACE},
diff --git a/42sh/src/parser/produce_sym.c b/42sh/src/parser/produce_sym.c
index 090b39cd..a7aceda1 100644
--- a/42sh/src/parser/produce_sym.c
+++ b/42sh/src/parser/produce_sym.c
@@ -6,7 +6,7 @@
 /*   By: ariard <ariard@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2017/02/09 17:58:34 by ariard            #+#    #+#             */
-/*   Updated: 2017/03/22 16:34:24 by ariard           ###   ########.fr       */
+/*   Updated: 2017/03/22 18:15:08 by ariard           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -68,14 +68,14 @@ t_prodmatch			g_prodmatch[] =
 	{TK_ASSIGNMENT_WORD, TK_ELIF, CMD_PREFIX},
 	{TK_ASSIGNMENT_WORD, TK_ELSE, CMD_PREFIX},
 	{TK_ASSIGNMENT_WORD, NEWLINE_LIST, CMD_PREFIX},
-	{TK_ASSIGNMENT_WORD, CMD_NAME, CMD_PREFIX},
-	{TK_ASSIGNMENT_WORD, CMD_SUPERIOR, CMD_PREFIX},
-	{TK_ASSIGNMENT_WORD, COMPOUND_LIST, CMD_PREFIX},
+	{TK_ASSIGNMENT_WORD, CMD_NAME, CMD_SUFFIX},
+	{TK_ASSIGNMENT_WORD, CMD_SUPERIOR, CMD_SUFFIX},
+	{TK_ASSIGNMENT_WORD, COMPOUND_LIST, CMD_SUFFIX},
 	{TK_ASSIGNMENT_WORD, COMPLETE_CONDITION, CMD_PREFIX},
 	{TK_ASSIGNMENT_WORD, CONDITION, CMD_PREFIX},
 	{TK_ASSIGNMENT_WORD, AND_OR, CMD_PREFIX},
 	{TK_ASSIGNMENT_WORD, AND_OR_MAJOR, CMD_PREFIX},
-	{TK_ASSIGNMENT_WORD, PIPE_SEMI_SEQUENCE, CMD_PREFIX},
+	{TK_ASSIGNMENT_WORD, PIPE_SEMI_SEQUENCE, CMD_SUFFIX},
 	{TK_ASSIGNMENT_WORD, SEQUENCE, CMD_PREFIX},
 	{TK_ASSIGNMENT_WORD, COMPLETE_COMMANDS, CMD_PREFIX},
 	{TK_ASSIGNMENT_WORD, CMD_WORD, CMD_SUFFIX},