diff --git a/includes/minishell.h b/includes/minishell.h
index a2fce57..1d204de 100644
--- a/includes/minishell.h
+++ b/includes/minishell.h
@@ -110,20 +110,20 @@ void	lone_export(t_s_cmd *cmd);
 int		find_variable(char *variable, t_s_cmd *cmd);
 int		find_it(char **str, char *s);
 int		check_variable(char *variable);
-int		cd_error_simple(char *str, int i);
-int		msg_error(char *cmd, char *entry, char *error, int i);
+int		cd_error(t_s_cmd *cmd, char *str, int i);
+int		msg_error(t_s_cmd *cmd, char *cm, char *entry, char *error, int i);
 int		size_path(char **str);
 int		check_return(t_s_cmd *cmd, int var);
 
 //real builtin
-void	print_env(t_cmd *cmd);
+int		print_env(t_cmd *cmd);
 void	ft_env(t_s_cmd *cmd, char **env);
 void	ft_exit(t_s_cmd *cmd);
-void	ft_export(t_s_cmd *cmd);
-void	ft_unset(t_s_cmd *cmd);
-void	ft_echo(t_s_cmd *cmd);
-void	ft_pwd(t_s_cmd *cmd);
-void	open_directory(t_s_cmd *cmd);//cd
+int		ft_export(t_s_cmd *cmd);
+int		ft_unset(t_s_cmd *cmd);
+int		ft_echo(t_s_cmd *cmd);
+int		ft_pwd(t_s_cmd *cmd);
+int		open_directory(t_s_cmd *cmd);//cd
 
 //parse builtin
 int	is_builtin(char *cmd);
diff --git a/srcs/built_in/cd.c b/srcs/built_in/cd.c
index d859e04..8ac1985 100644
--- a/srcs/built_in/cd.c
+++ b/srcs/built_in/cd.c
@@ -134,7 +134,7 @@ void	check_home(t_s_cmd *cmd, char *p)
 	free(p);
 }
 
-void	open_directory(t_s_cmd *cmd)
+int	open_directory(t_s_cmd *cmd)
 {
 	char *p;
 	int j;
@@ -144,17 +144,17 @@ void	open_directory(t_s_cmd *cmd)
 		j = size_path(cmd->big_cmd->env);
 	if (cmd->nb_args > 2)
 	{
-		ft_putstr_fd("Minishell: cd: too many arguments\n", 2);
-		return ;
-		// return (cd_erreur("Minishell: cd: too many arguments", 1));
+		// ft_putstr_fd("Minishell: cd: too many arguments\n", 2);
+		// return ;
+		return (cd_error(cmd, "Minishell: cd: too many arguments", 1));
 	}
 	if (!cmd->args[1])
 	{
 		if (find_it(cmd->big_cmd->env, "HOME") < 0)
 		{
-			ft_putstr_fd("Minishell: cd: HOME not set\n", 2);
-			return ;
-			// return (cd_erreur("Minishell: cd: HOME not set", 1));
+			// ft_putstr_fd("Minishell: cd: HOME not set\n", 2);
+			// return ;
+			return (cd_error(cmd, "Minishell: cd: HOME not set", 1));
 		}
 		check_home(cmd, p);
 	}
@@ -169,12 +169,13 @@ void	open_directory(t_s_cmd *cmd)
 		}
 		else
 		{
-			// return (msg_error("Minishell: cd: ", cmd->args[1], ": No such directory\n", 1));
-			ft_putstr_fd("Minishell: cd: ", 2);
-			ft_putstr_fd(cmd->args[1], 2);
-			ft_putstr_fd(": No such directory\n", 2);
-			return ;//(1);
+			return (msg_error(cmd, "Minishell: cd: ", cmd->args[1], ": No such directory\n", 1));
+			// ft_putstr_fd("Minishell: cd: ", 2);
+			// ft_putstr_fd(cmd->args[1], 2);
+			// ft_putstr_fd(": No such directory\n", 2);
+			// return ;//(1);
 		}
 	}
+	return (check_return(cmd, 0));
 }
 
diff --git a/srcs/built_in/echo.c b/srcs/built_in/echo.c
index 92f794d..bdc5840 100644
--- a/srcs/built_in/echo.c
+++ b/srcs/built_in/echo.c
@@ -12,126 +12,7 @@
 
 #include "../../includes/minishell.h"
 
-// int	jump_space(char *str, int i)
-// {
-// 	int	j;
-
-// 	j = i;
-// 	while (str[j] == ' ')
-// 		j++;
-// 	return (j);
-// }
-
-// void	print_value(char *str, char *input)
-// {
-// 	(void)input;
-// 	int i;
-
-// 	i = 0;
-// 	while (str[i] && str[i] != '=')
-// 		i++;
-// 	i++;
-// 	ft_putstr_fd(str + i, 0);
-// 	/*while (str[i])
-// 	{
-// 		ft_putchar(str[i]);
-// 		i++;
-// 	}*/
-// }
-
-// void	print_rest(char *input, char *str, int j)
-// {
-// 	int	i;
-//
-// 	i = 0;
-// 	j -= 1;
-// 	while (input[j++])
-// 		printf("%c", input[j]);
-// 	printf("\n");
-// 	while (input[j] && input[j] == str[i])
-// 	{
-// 		i++;
-// 		j++;
-// 	}
-// 	printf("str == %s\n", str);
-// 	if (input[j] != '\0')
-// 	{
-// 		j = jump_space(input, j);
-// 		if (input[j] != '\0')
-// 			while(input[j])
-// 			{
-// 				ft_putchar(input[j]);
-// 				j++;
-// 			}
-// 		else
-// 			return;
-// 	}
-// 	else
-// 		return ;
-// }
-
-// void	find_for_print(t_s_cmd *cmd, char *input)
-// {
-// 	char *str;
-// 	// char *tmp;
-// 	int	i;
-// 	int x;
-
-// 	i = 0;
-// 	// j = j + 1;
-// 	// tmp = ft_substr(input, j, find_len(input, j, 32));
-// 	// printf("%c\n", input[j]);
-// 	str = ft_strjoin(input, "=");
-// 	x = ft_strlen(str);
-// 	// printf("%d\n", x);
-// 	while (cmd->big_cmd->env[i])
-// 	{
-// 		if (ft_strncmp(cmd->big_cmd->env[i], str, x) == 0)
-// 		{
-// 			// printf("%s\n", cmd->big_cmd->env[i]);
-// 			break ;
-// 		}
-
-// 		i++;
-// 	}
-// 	if (cmd->big_cmd->env[i] != NULL)
-// 	{
-// 		print_value(cmd->big_cmd->env[i], input);
-// 		// print_rest(input, tmp, j);
-// 	}
-// }
-
-// int	dollar_or_not(char *str)
-// {
-// 	int i;
-
-// 	i = 0;
-// 	while (str[i])
-// 	{
-// 		if (str[i] == '$')
-// 			return (1);
-// 		i++;
-// 	}
-// 	return (0);
-// }
-
-// void	find_value(t_s_cmd *cmd, char *str)
-// {
-// 	// int i;
-// 	//
-// 	// i = 0;
-// 	while (*str)
-// 	{
-// 		if (*str == '$')
-// 			break ;
-// 		printf("%c", *str);
-// 		str++;
-// 	}
-// 	str++;
-// 	find_for_print(cmd, str);
-// }
-
-void	ft_echo(t_s_cmd *d)
+int	ft_echo(t_s_cmd *d)
 {
 	int	i;
 	size_t j;
@@ -144,9 +25,6 @@ void	ft_echo(t_s_cmd *d)
 		j = 1;
 		while (d->args[i][j] && d->args[i][j] == 'n')
 			j++;
-		// printf("---->%zu\n", j);
-	// printf("--->%zu\n", ft_strlen(d->args[i]));
-
 		if (j == ft_strlen(d->args[i]))
 			is_option = 1;
 		else
@@ -156,16 +34,12 @@ void	ft_echo(t_s_cmd *d)
 	if (d->args[i])
 		while (d->args[i])
 		{
-			// if (dollar_or_not(d->args[i]) == 1)
-			// 	find_value(d, d->args[i]);
-			// else
 			printf("%s", d->args[i]);
 			if (d->args[i + 1] != NULL)
 				printf(" ");
 			i++;
 		}
-	// else
-	// 	my_putstr(input, i);
 	if (is_option == 0)
 		printf("\n");
+	return (check_return(d, 0));
 }
diff --git a/srcs/built_in/env.c b/srcs/built_in/env.c
index 64a9a61..fc1d7e3 100644
--- a/srcs/built_in/env.c
+++ b/srcs/built_in/env.c
@@ -12,7 +12,7 @@
 
 #include "../../includes/minishell.h"
 
-void	print_env(t_cmd *cmd)
+int	print_env(t_cmd *cmd)
 {
 	int	i;
 
@@ -22,7 +22,7 @@ void	print_env(t_cmd *cmd)
 		ft_putstr_fd("Minishell: env: '", 2);
 		ft_putstr_fd(cmd->current_s_cmd->args[1], 2);
 		ft_putstr_fd("': No such file or directory\n", 2);
-		// return (127);
+		return (check_return(cmd, 127));
 	}
 	else if (cmd->env)
 	{
@@ -33,10 +33,10 @@ void	print_env(t_cmd *cmd)
 			i++;
 		}
 	}
-	// return (0);
+	return (check_return(cmd, 0));
 }
 
-void	ft_pwd(t_s_cmd *cmd)
+int	ft_pwd(t_s_cmd *cmd)
 {
 	(void)cmd;
 	int	i;
@@ -48,9 +48,9 @@ void	ft_pwd(t_s_cmd *cmd)
 	if (!str)
 	{
 		ft_putstr_fd("Minishell: pwd: Not found\n", 2);
-		// return (1);
+		return (check_return(cmd, 1));
 	}
 	else
 		ft_putendl_fd(p, 1);
-	// return (0);
+	return (check_return(cmd, 0));
 }
\ No newline at end of file
diff --git a/srcs/built_in/export.c b/srcs/built_in/export.c
index f66362a..110988a 100644
--- a/srcs/built_in/export.c
+++ b/srcs/built_in/export.c
@@ -59,7 +59,8 @@ int	ft_export_variable(t_s_cmd *cmd, char *variable)
 		ft_putstr_fd("Minishell: export: `", 2);
 		ft_putstr_fd(variable, 2);
 		ft_putstr_fd("': not a valid identifier\n", 2);
-		return (1);
+		return (check_return(cmd, 1));
+
 	}
 	dest = ft_strdup(variable);
 	unset = ft_substr(dest, 0, find_len(dest, 0, '='));
@@ -67,17 +68,18 @@ int	ft_export_variable(t_s_cmd *cmd, char *variable)
 	{
 		cmd->big_cmd->env[find_it(cmd->big_cmd->env, unset)] = dest;
 		free(unset);
-		return (0);
+		return (check_return(cmd, 0));
 	}
 	register_env(cmd, dest);
 	if (dest)
 		free(dest);
 	if (unset)
 		free(unset);
-	return (0);
+	return (check_return(cmd, 0));
+
 }
 
-void	ft_export(t_s_cmd *cmd)
+int	ft_export(t_s_cmd *cmd)
 {
 	int	i;
 	int j;
@@ -92,4 +94,5 @@ void	ft_export(t_s_cmd *cmd)
 			j = ft_export_variable(cmd, cmd->args[i]);
 			i++;
 		}
+	return (j);
 }
diff --git a/srcs/built_in/unset.c b/srcs/built_in/unset.c
index fac4579..ff05955 100644
--- a/srcs/built_in/unset.c
+++ b/srcs/built_in/unset.c
@@ -14,8 +14,8 @@
 
 void	unset_variable(t_s_cmd *cmd, int i)
 {
-	int	a;
-	int	b;
+	int		a;
+	int		b;
 	char	**tmp;
 
 	a = 0;
@@ -39,12 +39,6 @@ void	unset_variable(t_s_cmd *cmd, int i)
 	if (!cmd->big_cmd->env)
 		printf("no env\n");
 	cmd->big_cmd->env = ft_dup_double(tmp);
-	// while (tmp[a])
-	// {
-	// 	cmd->big_cmd->env[a] = ft_strdup(tmp[a]);
-	// 	a++;
-	// }
-	// cmd->big_cmd->env[a] = NULL;
 	if (tmp)
 		free_double(tmp);
 }
@@ -61,15 +55,16 @@ int	find_variable(char *variable, t_s_cmd *cmd)
 		ft_putstr_fd("Minishell: unset: `", 2);
 		ft_putstr_fd(variable, 2);
 		ft_putstr_fd("': not a valid identifier\n", 2);
-		return (2);
+		return (check_return(cmd, 2));
+
 	}
 	if (i == tab_len(cmd->big_cmd->env))
-		return (2);
+		return (check_return(cmd, 2));
 	unset_variable(cmd, i);
-	return (0);
+	return (check_return(cmd, 1));
 }
 
-void	ft_unset(t_s_cmd *cmd)
+int	ft_unset(t_s_cmd *cmd)
 {
 	int	i;
 	int	j;
@@ -81,5 +76,5 @@ void	ft_unset(t_s_cmd *cmd)
 		j = find_variable(cmd->args[i], cmd);
 		i++;
 	}
-	// return (j);
+	return (j);
 }
diff --git a/srcs/built_in/utils_builtin.c b/srcs/built_in/utils_builtin.c
index 3fe5219..6f0db09 100644
--- a/srcs/built_in/utils_builtin.c
+++ b/srcs/built_in/utils_builtin.c
@@ -35,19 +35,19 @@ int    find_it(char **str, char *s)
 	return (i);
 }
 
-int	 cd_error_simple(char *str, int i)
+int	 cd_error(t_s_cmd *cmd, char *str, int i)
 {
 	ft_putstr_fd(str, 2);
 	ft_putstr_fd("\n", 2);
-	return (i);
+	return (check_return(cmd, i));
 }
 
-int msg_error(char *cmd, char *entry, char *error, int i)
+int msg_error(t_s_cmd *cmd, char *cm, char *entry, char *error, int i)
 {
-	ft_putstr_fd(cmd, 2);
+	ft_putstr_fd(cm, 2);
 	ft_putstr_fd(entry, 2);
 	ft_putstr_fd(error, 2);
-	return (i);
+	return (check_return(cmd, i));
 }
 
 int	size_path(char **str)
@@ -61,4 +61,15 @@ int	size_path(char **str)
 	j = double_size(s);
 	free_double(s);
 	return (j);
-}
\ No newline at end of file
+}
+
+int		check_return(t_s_cmd *cmd, int var)
+{
+	if (cmd->big_cmd->current_s_cmd->child)
+	{
+		cmd->big_cmd->err_var = var;
+		return (var);
+	}
+	else
+		exit(var);
+}