diff --git a/.execution.c.swp b/.execution.c.swp
new file mode 100644
index 0000000..99fb472
Binary files /dev/null and b/.execution.c.swp differ
diff --git a/execution.c b/execution.c
index fa73ae0..6bf9281 100644
--- a/execution.c
+++ b/execution.c
@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/21 12:45:16 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/21 13:48:39 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/02/21 15:06:12 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -95,21 +95,25 @@ static int	ft_excutor(t_cmd *cmd, t_list **env)
 
 static int	ft_own_cmd(t_list **env, t_cmd *cmd)
 {
-	/* if (ft_strcmp(cmd->executable, "pwd") == 0) */
-	/* 	return (pwd(env, cmd->fd_out)); */
-	if (ft_strcmp(cmd->executable, "env") == 0)
-		return (print_env(env, cmd->fd_out));
-	if (ft_strcmp(cmd->executable, "export") == 0)
-		return (print_export(env, cmd->fd_out));
-	/* if (ft_strcmp(cmd->executable, "cd") == 0) */
-	/* 	return (move_folder(cmd->args[0], cmd->fd_out)); */
+	int	return_code;
+
+	return_code = -1;
+	if (ft_strcmp(cmd->executable, "pwd") == 0)
+		return_code = pwd(cmd->fd_out);
+	else if (ft_strcmp(cmd->executable, "env") == 0)
+		return_code = print_env(env, cmd->fd_out);
+	else if (ft_strcmp(cmd->executable, "export") == 0)
+		return_code = (print_export(env, cmd->fd_out));
+	else if (ft_strcmp(cmd->executable, "cd") == 0)
+		return_code = (move_folder(cmd->args[0], cmd->fd_out));
 	/* if (ft_strcmp(cmd->executable, "unset") == 0) */
-	/* 	return (unset(env, cmd->args, cmd->fd_out)); */
-	/* if (ft_strcmp(cmd->executable, "echo") == 0) */
-	/* 	return (echo(cmd->fd_out, cmd->args[0])); */
-	if (ft_strcmp(cmd->executable, "exit") == 0)
-		return (-2);
-	return (-1);
+	/* 	return_code = (unset(env, cmd->args, cmd->fd_out)); */
+	else if (ft_strcmp(cmd->executable, "echo") == 0)
+		return_code = (echo(cmd->fd_out, cmd->args + 1));
+	else if (ft_strcmp(cmd->executable, "exit") == 0)
+		return_code = -2;
+	cmd->executable = NULL;
+	return (return_code);
 }
 
 int	ft_cmds_executor(t_list **cmds, t_list **env)
diff --git a/main.c b/main.c
index b67da56..41e02c6 100644
--- a/main.c
+++ b/main.c
@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/16 15:16:14 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/21 14:24:45 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/02/21 14:48:07 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -17,8 +17,13 @@ static char	*ft_get_user_input(t_list **env)
 {
 	char	*line;
 	char	*prompt;
+	char	*pwd;
 
-	prompt = ft_strmerger(2, get_value_by_key("PWD", env), "$ ");
+	pwd = get_pwd(2);
+	if (pwd == NULL)
+		return (NULL);
+	prompt = ft_strmerger(2, pwd, "$ ");
+	free(pwd);
 	if (prompt == NULL)
 	{
 		ft_eprintf("minishell: malloc failed\n");
diff --git a/minishell.h b/minishell.h
index 53889ca..531af7d 100644
--- a/minishell.h
+++ b/minishell.h
@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/14 13:45:30 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/21 14:43:45 by erey-bet         ###   ########.fr       */
+/*   Updated: 2023/02/21 15:05:50 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -60,7 +60,7 @@ char		*get_value(char *str);
 char		*get_key(char *str);
 
 /* Echo */
-int			echo(int fd, char *str);
+int			echo(int fd, char **args);
 /* PWD */
 int			pwd(int fd);
 char		*get_pwd(int fd);
diff --git a/vsupp b/vsupp
new file mode 100644
index 0000000..1b3bbf6
--- /dev/null
+++ b/vsupp
@@ -0,0 +1,15 @@
+{
+   readline
+   Memcheck:Leak
+   ...
+   fun:readline
+   ...
+}
+
+{
+   readline
+   Memcheck:Leak
+   ...
+   fun:add_history
+   ...
+}