diff --git a/srcs/.main.c.swp b/srcs/.main.c.swp
deleted file mode 100644
index a95f211..0000000
Binary files a/srcs/.main.c.swp and /dev/null differ
diff --git a/srcs/exec_utils.c b/srcs/exec_utils.c
index 7848730..3b1974e 100644
--- a/srcs/exec_utils.c
+++ b/srcs/exec_utils.c
@@ -6,7 +6,7 @@
 /*   By: marde-vr <marde-vr@42angouleme.fr>         +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/04/24 10:46:28 by marde-vr          #+#    #+#             */
-/*   Updated: 2024/04/24 10:49:02 by marde-vr         ###   ########.fr       */
+/*   Updated: 2024/04/24 14:05:18 by tomoron          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -18,13 +18,13 @@ void	get_redirections(t_msh *msh, t_cmd *cmds)
 	msh->out_type = 0;
 	if (first_is_in_type(cmds))
 	{
-		if (!get_in_type(msh, cmds))
+		if (!get_in_type(msh, cmds, cmds, 1))
 			get_out_type(msh, cmds);
 	}
 	else
 	{
 		if (!get_out_type(msh, cmds))
-			get_in_type(msh, cmds);
+			get_in_type(msh, cmds, cmds, 1);
 	}
 }
 
diff --git a/srcs/input_redirections.c b/srcs/input_redirections.c
index 1aa9024..403d8e3 100755
--- a/srcs/input_redirections.c
+++ b/srcs/input_redirections.c
@@ -6,7 +6,7 @@
 /*   By: marde-vr <marde-vr@42angouleme.fr>         +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/03/05 18:15:27 by marde-vr          #+#    #+#             */
-/*   Updated: 2024/04/23 16:41:42 by tomoron          ###   ########.fr       */
+/*   Updated: 2024/04/24 14:04:30 by tomoron          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -62,7 +62,7 @@ int	open_input_file(t_msh *msh, t_cmd **cur_token)
 	return (0);
 }
 
-int	get_in_type(t_msh *msh, t_cmd *tokens)
+int	get_in_type(t_msh *msh, t_cmd *t_strt, t_cmd *tokens, int here_doc)
 {
 	t_cmd	*cur_token;
 
@@ -75,7 +75,8 @@ int	get_in_type(t_msh *msh, t_cmd *tokens)
 	while (cur_token && (cur_token->cmd_type == CMD
 			|| cur_token->cmd_type == PAREN))
 		cur_token = cur_token->next;
-	if (cur_token && is_input_type(cur_token))
+	if (cur_token && ((cur_token->cmd_type == HERE_DOC && here_doc) 
+		|| (cur_token->cmd_type == RED_I && !here_doc)))
 	{
 		msh->in_type = cur_token->cmd_type;
 		if (open_input_file(msh, &cur_token))
@@ -83,7 +84,9 @@ int	get_in_type(t_msh *msh, t_cmd *tokens)
 	}
 	if (cur_token && cur_token->next && !is_operand_type(cur_token->next)
 		&& cur_token->cmd_type != PIPE && cur_token->next->cmd_type != PIPE)
-		return (get_in_type(msh, cur_token->next));
+		return (get_in_type(msh, t_strt, cur_token->next, here_doc));
+	if (here_doc)
+		return(get_in_type(msh, t_strt, t_strt, 0));
 	return (0);
 }
 
diff --git a/srcs/main.c b/srcs/main.c
index 9822822..3aa42a1 100755
--- a/srcs/main.c
+++ b/srcs/main.c
@@ -6,7 +6,7 @@
 /*   By: marde-vr <marde-vr@42angouleme.fr>         +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/02/02 21:59:20 by tomoron           #+#    #+#             */
-/*   Updated: 2024/04/24 13:07:14 by tomoron          ###   ########.fr       */
+/*   Updated: 2024/04/24 13:55:40 by tomoron          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -92,7 +92,7 @@ int	init_minishell(t_msh **msh, int argc, char **argv, char **envp)
 
 	*msh = ft_calloc(1, sizeof(t_msh));
 	if (!*msh)
-		ft_exit(*msh, 1);
+		exit(1);
 	(void)argc;
 	(void)argv;
 	(*msh)->env = get_env(envp);
@@ -118,7 +118,7 @@ int	main(int argc, char **argv, char **envp)
 	{
 		prompt = get_prompt(msh->env);
 		if (!prompt)
-			exit(1);
+			ft_exit(msh, 1);
 		commands = readline(prompt);
 		free(prompt);
 		add_history(commands);
diff --git a/srcs/minishell.h b/srcs/minishell.h
index 61a8e1d..765cecf 100755
--- a/srcs/minishell.h
+++ b/srcs/minishell.h
@@ -6,7 +6,7 @@
 /*   By: marde-vr <marde-vr@42angouleme.fr>         +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/02/04 17:31:38 by tomoron           #+#    #+#             */
-/*   Updated: 2024/04/24 10:59:46 by marde-vr         ###   ########.fr       */
+/*   Updated: 2024/04/24 14:03:39 by tomoron          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -99,7 +99,7 @@ int		is_fd_open(int fd);
 int		get_out_type(t_msh *msh, t_cmd *cmds);
 void	exec_commands(t_msh *msh);
 void	handle_here_doc(t_msh *msh, char *eof);
-int		get_in_type(t_msh *msh, t_cmd *tokens);
+int		get_in_type(t_msh *msh, t_cmd *t_strt, t_cmd *tokens, int here_doc);
 void	signal_handler_interactive(int signum);
 int		get_token_len(char *cmd, t_env *env);
 void	print_syntax_error_bonus(t_cmd *cmd);