diff --git a/42sh/sample/while.sh b/42sh/sample/while.sh
index 26568e98..d0fd226b 100644
--- a/42sh/sample/while.sh
+++ b/42sh/sample/while.sh
@@ -1,11 +1,12 @@
-while ls 
-do 
-	while ls
+while 
+	while
+	   while ls | cat
+	   do
+			ls
+	 	done		
 	do
-		pwd
-	done	
-	while ls 
-	do
-		pwd
+		ls | cat
 	done
+do 
+	pwd
 done 
diff --git a/42sh/src/parser/.eval_sym.c.swn b/42sh/src/parser/.eval_sym.c.swn
index 291aa4f1..4b984d38 100644
Binary files a/42sh/src/parser/.eval_sym.c.swn and b/42sh/src/parser/.eval_sym.c.swn differ
diff --git a/42sh/src/parser/add_cmd.c b/42sh/src/parser/add_cmd.c
index fd7bfaf4..9c89439f 100644
--- a/42sh/src/parser/add_cmd.c
+++ b/42sh/src/parser/add_cmd.c
@@ -6,7 +6,7 @@
 /*   By: ariard <ariard@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2017/02/15 20:49:15 by ariard            #+#    #+#             */
-/*   Updated: 2017/02/18 20:12:23 by ariard           ###   ########.fr       */
+/*   Updated: 2017/02/19 17:41:59 by ariard           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/42sh/src/parser/add_loop.c b/42sh/src/parser/add_loop.c
index 0067faa9..b6446d8c 100644
--- a/42sh/src/parser/add_loop.c
+++ b/42sh/src/parser/add_loop.c
@@ -6,7 +6,7 @@
 /*   By: ariard <ariard@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2017/02/17 22:17:14 by ariard            #+#    #+#             */
-/*   Updated: 2017/02/18 20:12:26 by ariard           ###   ########.fr       */
+/*   Updated: 2017/02/19 17:52:52 by ariard           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -21,6 +21,9 @@ int		isloop(t_btree **ast)
 	{
 		node = (*ast)->item;
 		DG("TEST LOOP");
+		if ((node->type == TK_NEWLINE || node->type == TK_SEMI ||
+			node->type == TK_AMP) && (isloop(&(*ast)->right) == 1))
+			return (1);
 		if (node->type == TK_WHILE && node->full == 1)
 		{
 			DG("DON ENTER");
@@ -59,7 +62,7 @@ int		add_loop_cmd(t_btree **ast, t_list **lst)
 		DG("WHILE FULL");
 		return ((node->full = 1));
 	}
-	if (token->type == TK_DO)
+	if (token->type == TK_DO && node->nest == 0)
 		return (add_cmd(&(*ast)->right, lst));
 	else if (!(*ast)->right && isloop(&(*ast)->left) != 2)
 		return (add_cmd(&(*ast)->left, lst));
diff --git a/42sh/src/parser/add_sep.c b/42sh/src/parser/add_sep.c
index fb7dcb1e..2f4b9cb4 100644
--- a/42sh/src/parser/add_sep.c
+++ b/42sh/src/parser/add_sep.c
@@ -6,7 +6,7 @@
 /*   By: ariard <ariard@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2017/02/15 19:12:07 by ariard            #+#    #+#             */
-/*   Updated: 2017/02/19 16:48:44 by ariard           ###   ########.fr       */
+/*   Updated: 2017/02/19 17:51:51 by ariard           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/42sh/src/parser/aggregate_sym.c b/42sh/src/parser/aggregate_sym.c
index d1020a8c..cc54a891 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/02/09 17:39:18 by ariard            #+#    #+#             */
-/*   Updated: 2017/02/19 16:48:12 by ariard           ###   ########.fr       */
+/*   Updated: 2017/02/19 17:35:28 by ariard           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -52,6 +52,7 @@ t_aggrematch		g_aggrematch[] =
 	{LINEBREAK, COMPOUND_LIST, COMPOUND_LIST, COMPOUND_LIST},
 	{NEWLINE_LIST, CMD_NAME, CMD_SUPERIOR, CMD_NAME},
 	{NEWLINE_LIST, TK_DO, TK_DO, TK_DO},
+	{NEWLINE_LIST, TK_WHILE, TK_WHILE, TK_WHILE},
 	{NEWLINE_LIST, NEWLINE_LIST, NEWLINE_LIST, NEWLINE},
 	{NEWLINE_LIST, NAME, SEQUENTIAL_SEP, 0},
 	{NEWLINE_LIST, IN, SEQUENTIAL_SEP, 0},
@@ -187,20 +188,20 @@ int			aggregate_sym(t_sym **stack, t_sym *new_sym, t_parstate *state)
 	int		i;
 
 	i = 0;
-	DG("aggregate head %s && sym %s",
-	read_state(**stack), read_state(*new_sym));
+//	DG("aggregate head %s && sym %s",
+//	read_state(**stack), read_state(*new_sym));
 	while (g_aggrematch[i].top)
 	{
 		if (*new_sym == g_aggrematch[i].top
 			&& MATCH_STACK(**stack, g_aggrematch[i].under))
 	
 		{
-			DG("MATCH : %s", read_state(g_aggrematch[i].new_sym));
+//			DG("MATCH : %s", read_state(g_aggrematch[i].new_sym));
 			*new_sym = g_aggrematch[i].new_sym;
 			if (g_aggrematch[i].erase_sym)
 			{
 				pop_stack(stack, g_aggrematch[i].erase_sym);
-				DG("stack after pop: %s", read_state(**stack));
+//				DG("stack after pop: %s", read_state(**stack));
 			}
 			if (eval_sym(**stack, *new_sym))
 				return ((*state = ERROR));
diff --git a/42sh/src/parser/build_tree.c b/42sh/src/parser/build_tree.c
index a5d73447..53221db5 100644
--- a/42sh/src/parser/build_tree.c
+++ b/42sh/src/parser/build_tree.c
@@ -6,7 +6,7 @@
 /*   By: ariard <ariard@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2017/02/15 18:32:59 by ariard            #+#    #+#             */
-/*   Updated: 2017/02/19 16:35:25 by ariard           ###   ########.fr       */
+/*   Updated: 2017/02/19 17:34:55 by ariard           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -30,8 +30,8 @@ t_treematch			g_treematch[] =
 
 static int	isseparator(int type, int cache)
 {
-	if (type == TK_NEWLINE && (cache == TK_WHILE 
-		|| cache == TK_DO))
+	if (type == TK_NEWLINE && (cache == TK_WHILE || cache == TK_DO 
+		|| cache == TK_NEWLINE))
 		return (0);
 	return (1);
 }
diff --git a/42sh/src/parser/error_syntax.c b/42sh/src/parser/error_syntax.c
index 83003a69..e08921c7 100644
--- a/42sh/src/parser/error_syntax.c
+++ b/42sh/src/parser/error_syntax.c
@@ -6,7 +6,7 @@
 /*   By: ariard <ariard@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2017/02/09 20:15:35 by ariard            #+#    #+#             */
-/*   Updated: 2017/02/19 16:35:56 by ariard           ###   ########.fr       */
+/*   Updated: 2017/02/19 17:06:08 by ariard           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/42sh/src/parser/eval_sym.c b/42sh/src/parser/eval_sym.c
index 6f059bfa..02dfd106 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/02/09 16:26:30 by ariard            #+#    #+#             */
-/*   Updated: 2017/02/19 16:53:14 by ariard           ###   ########.fr       */
+/*   Updated: 2017/02/19 17:43:42 by ariard           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -196,6 +196,7 @@ t_stackmatch	g_stackmatch[] =
 	{TK_WHILE, NEWLINE_LIST},
 	{TK_WHILE, PIPE_SEMI_SEQUENCE},
 	{TK_WHILE, TK_DO},
+	{TK_WHILE, TK_WHILE},
 	{TK_WHILE, COMPOUND_LIST},
 	{TK_UNTIL, LINEBREAK},
 	{TK_UNTIL, TK_BANG},
@@ -268,6 +269,7 @@ t_stackmatch	g_stackmatch[] =
 	{LINEBREAK, COMPOUND_LIST},
 	{LINEBREAK, PROGRAM},
 	{NEWLINE_LIST, TK_DO},
+	{NEWLINE_LIST, TK_WHILE},
 	{NEWLINE_LIST, CMD_NAME},
 	{NEWLINE_LIST, NEWLINE_LIST},
 	{NEWLINE_LIST, NAME},
@@ -392,6 +394,7 @@ t_stackmatch	g_stackmatch[] =
 	{WHILE_CLAUSE, NEWLINE_LIST},
 	{WHILE_CLAUSE, PIPE_SEMI_SEQUENCE},
 	{WHILE_CLAUSE, TK_DO},
+	{WHILE_CLAUSE, TK_WHILE},
 	{WHILE_CLAUSE, COMPOUND_LIST},
 	{ELSE_PART, COMPOUND_LIST},
 	{IF_CLAUSE, LINEBREAK},
@@ -442,6 +445,7 @@ t_stackmatch	g_stackmatch[] =
 	{COMPOUND_COMMAND, PIPE_SEMI_SEQUENCE},
 	{COMPOUND_COMMAND, FUNC},
 	{COMPOUND_COMMAND, TK_DO},
+	{COMPOUND_COMMAND, TK_WHILE},
 	{COMPOUND_COMMAND, COMPOUND_LIST},
 	{COMMAND, TK_WHILE},
 	{COMMAND, LINEBREAK},
@@ -498,7 +502,7 @@ int			eval_sym(t_sym stack, t_sym new_sym)
 {
 	int				i;
 
-	DG("eval head %s && sym %s", read_state(stack), read_state(new_sym));
+//	DG("eval head %s && sym %s", read_state(stack), read_state(new_sym));
 	i = 0;
 	while (g_stackmatch[i].top)
 	{
diff --git a/42sh/src/parser/ft_parse.c b/42sh/src/parser/ft_parse.c
index 2410bf7e..e1d746b6 100644
--- a/42sh/src/parser/ft_parse.c
+++ b/42sh/src/parser/ft_parse.c
@@ -6,7 +6,7 @@
 /*   By: ariard <ariard@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2017/02/09 14:30:22 by ariard            #+#    #+#             */
-/*   Updated: 2017/02/19 16:54:31 by ariard           ###   ########.fr       */
+/*   Updated: 2017/02/19 17:32:56 by ariard           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/42sh/src/parser/produce_sym.c b/42sh/src/parser/produce_sym.c
index 1244505a..d896e8d9 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/02/18 18:42:55 by ariard           ###   ########.fr       */
+/*   Updated: 2017/02/19 17:35:31 by ariard           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -50,6 +50,7 @@ t_prodmatch		g_prodmatch[] =
 	{TK_NAME, NEWLINE_LIST, FNAME},
 	{TK_NAME, TK_FOR, NAME},
 	{TK_NEWLINE, TK_DO, NEWLINE_LIST},
+	{TK_NEWLINE, TK_WHILE, NEWLINE_LIST},
 	{TK_NEWLINE, CMD_NAME, NEWLINE_LIST},
 	{TK_NEWLINE, COMPLETE_COMMANDS, NEWLINE_LIST},
 	{TK_NEWLINE, LINEBREAK, NEWLINE_LIST},