diff --git a/42sh/file b/42sh/file
new file mode 100644
index 00000000..07e7726d
--- /dev/null
+++ b/42sh/file
@@ -0,0 +1,16 @@
+total 80
+-rw-r--r--   1 ariard  2016_paris  8813 Mar  8 03:05 Makefile
+-rw-r--r--   1 ariard  2016_paris  6781 Mar  8 02:33 STDBUG
+drwxr-xr-x   7 ariard  2016_paris   238 Mar  4 14:53 TESTSHELL
+-rw-r--r--   1 ariard  2016_paris  4396 Mar  4 14:53 donovan_segaults_06-02
+-rw-r--r--   1 ariard  2016_paris     0 Mar  8 16:02 file
+drwxr-xr-x  16 ariard  2016_paris   544 Mar  8 15:52 includes
+-rw-r--r--   1 ariard  2016_paris   117 Mar  8 00:08 laurier.sh
+drwxr-xr-x  10 ariard  2016_paris   340 Mar  8 03:04 libft
+-rw-r--r--   1 ariard  2016_paris     0 Mar  4 14:53 parser_init.c
+drwxr-xr-x   6 ariard  2016_paris   204 Mar  4 14:53 pdf
+drwxr-xr-x  29 ariard  2016_paris   986 Mar  4 14:53 sample
+drwxr-xr-x  13 ariard  2016_paris   442 Mar  7 19:42 src
+-rwxr-xr-x   1 ariard  2016_paris   890 Mar  4 14:53 test_framework.sh
+-rwxr-xr-x   1 ariard  2016_paris   690 Mar  4 14:53 update_makefile.sh
+/Users/ariard/Projects/42sh
diff --git a/42sh/includes/builtin.h b/42sh/includes/builtin.h
index be6045e4..4610a117 100644
--- a/42sh/includes/builtin.h
+++ b/42sh/includes/builtin.h
@@ -6,7 +6,7 @@
 /*   By: jhalford <jhalford@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/12/13 17:21:56 by jhalford          #+#    #+#             */
-/*   Updated: 2017/03/07 17:29:38 by jhalford         ###   ########.fr       */
+/*   Updated: 2017/03/08 15:49:11 by ariard           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/42sh/includes/lexer.h b/42sh/includes/lexer.h
index d47b2e0f..21483e8a 100644
--- a/42sh/includes/lexer.h
+++ b/42sh/includes/lexer.h
@@ -6,7 +6,7 @@
 /*   By: jhalford <jack@crans.org>                  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/12/01 12:15:50 by jhalford          #+#    #+#             */
-/*   Updated: 2017/03/06 18:28:10 by ariard           ###   ########.fr       */
+/*   Updated: 2017/03/08 15:49:00 by ariard           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -25,6 +25,7 @@ enum	e_lexstate
 {
 	DEFAULT,
 	PAREN,
+	DLESS,
 	NEWLINE,
 	DELIM,
 	SEP,
@@ -34,7 +35,6 @@ enum	e_lexstate
 	GREAT,
 	LESSAND,
 	GREATAND,
-	DLESS,
 	QUOTE,
 	DQUOTE,
 	BQUOTE,
diff --git a/42sh/includes/types.h b/42sh/includes/types.h
index 95e2be0c..dd5e9f82 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/08 00:22:56 by wescande         ###   ########.fr       */
+/*   Updated: 2017/03/08 15:52:51 by ariard           ###   ########.fr       */
 /*   Updated: 2017/03/07 18:35:11 by jhalford         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
diff --git a/42sh/libft b/42sh/libft
index 4a36b1a5..73c28532 160000
--- a/42sh/libft
+++ b/42sh/libft
@@ -1 +1 @@
-Subproject commit 4a36b1a5e650ada2f66034d13312367694a6481a
+Subproject commit 73c28532404e437d670607c909fbe56d717e9683
diff --git a/42sh/src/main/main.c b/42sh/src/main/main.c
index 0527cf28..e8ac59eb 100644
--- a/42sh/src/main/main.c
+++ b/42sh/src/main/main.c
@@ -6,7 +6,7 @@
 /*   By: jhalford <jhalford@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/12/06 18:40:58 by jhalford          #+#    #+#             */
-/*   Updated: 2017/03/07 21:53:23 by ariard           ###   ########.fr       */
+/*   Updated: 2017/03/08 15:48:41 by ariard           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -44,7 +44,7 @@ int		handle_instruction(int fd)
 		ltoken = ft_lstlast(token);
 		if (lexer_lex(token ? &ltoken : &token, &lexer))
 			return (1);
-		if (get_lexer_stack(lexer) > 1)
+		if (get_lexer_stack(lexer) > 2)
 			continue ;
 		lexer.state = DEFAULT;
 		if (get_reserved_words(&token))