diff --git a/src/builtins/ft_cd.c b/src/builtins/ft_cd.c
index 4cd5c91..e94cb7c 100644
--- a/src/builtins/ft_cd.c
+++ b/src/builtins/ft_cd.c
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   ft_cd.c                                            :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
+/*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/22 15:07:24 by adjoly            #+#    #+#             */
-/*   Updated: 2024/07/16 15:48:44 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/07/19 11:38:34 by mmoussou         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -26,10 +26,12 @@ void	change_dir(char *new_pwd, char *pwd, t_env *env)
 	{
 		free(pwd);
 		send_error_parsing(ERROR_NO_FILE);
+		get_exit_code(1);
 		return ;
 	}
 	env_edit("PWD", ft_strdup(ret_cwd()), env);
 	env_edit("OLDPWD", pwd, env);
+	get_exit_code(0);
 }
 
 void	ft_cd(t_env *env, char *args)
diff --git a/src/builtins/ft_echo.c b/src/builtins/ft_echo.c
index bdf459a..b0cf1e4 100644
--- a/src/builtins/ft_echo.c
+++ b/src/builtins/ft_echo.c
@@ -6,11 +6,12 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/29 19:19:57 by adjoly            #+#    #+#             */
-/*   Updated: 2024/07/18 14:44:45 by mmoussou         ###   ########.fr       */
+/*   Updated: 2024/07/19 11:40:40 by mmoussou         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include <stdbool.h>
+#include "minishell.h"
 //#include <stdlib.h>
 #include "libft.h"
 #include <stdio.h>
@@ -57,4 +58,5 @@ void	ft_echo(char **args)
 	}
 	if (new_line == true)
 		ft_putchar_fd('\n', STDOUT_FILENO);
+	get_exit_code(0);
 }
diff --git a/src/builtins/ft_env.c b/src/builtins/ft_env.c
index f8bc822..210a984 100644
--- a/src/builtins/ft_env.c
+++ b/src/builtins/ft_env.c
@@ -6,7 +6,7 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/25 16:56:34 by mmoussou          #+#    #+#             */
-/*   Updated: 2024/07/16 13:20:17 by mmoussou         ###   ########.fr       */
+/*   Updated: 2024/07/19 11:29:19 by mmoussou         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -20,4 +20,5 @@ void	ft_env(t_env *env)
 			printf("%s=%s\n", env->name, env->content);
 		env = env->next;
 	}
+	get_exit_code(0);
 }
diff --git a/src/builtins/ft_exit.c b/src/builtins/ft_exit.c
index 97363b8..3f2c379 100644
--- a/src/builtins/ft_exit.c
+++ b/src/builtins/ft_exit.c
@@ -6,7 +6,7 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/07/14 13:46:57 by adjoly            #+#    #+#             */
-/*   Updated: 2024/07/15 16:22:22 by mmoussou         ###   ########.fr       */
+/*   Updated: 2024/07/19 11:30:31 by mmoussou         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/src/builtins/ft_export.c b/src/builtins/ft_export.c
index d9f9c34..e4a1851 100644
--- a/src/builtins/ft_export.c
+++ b/src/builtins/ft_export.c
@@ -6,7 +6,7 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/26 08:42:36 by mmoussou          #+#    #+#             */
-/*   Updated: 2024/07/18 14:40:56 by mmoussou         ###   ########.fr       */
+/*   Updated: 2024/07/19 11:34:03 by mmoussou         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/src/builtins/ft_export_utils.c b/src/builtins/ft_export_utils.c
index efa7128..8412fb2 100644
--- a/src/builtins/ft_export_utils.c
+++ b/src/builtins/ft_export_utils.c
@@ -6,7 +6,7 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/07/11 18:59:27 by mmoussou          #+#    #+#             */
-/*   Updated: 2024/07/17 01:03:58 by mmoussou         ###   ########.fr       */
+/*   Updated: 2024/07/19 11:33:57 by mmoussou         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -89,7 +89,7 @@ int	check_export_input(char *input)
 	if ((!ft_isalpha(input[i]) && input[i] != '_') || input[i] == '=')
 	{
 		printf("minishell: export: '%s': not a valid identifier\n", input);
-		return (1);
+		return (get_exit_code(1));
 	}
 	i++;
 	while (input[i] && input[i] != '=')
@@ -102,9 +102,9 @@ int	check_export_input(char *input)
 				continue ;
 			}
 			printf("minishell: export: '%s': not a valid identifier\n", input);
-			return (1);
+			return (get_exit_code(1));
 		}
 		i++;
 	}
-	return (0);
+	return (get_exit_code(0));
 }
diff --git a/src/builtins/ft_pwd.c b/src/builtins/ft_pwd.c
index 0d8d7a0..31d7e70 100644
--- a/src/builtins/ft_pwd.c
+++ b/src/builtins/ft_pwd.c
@@ -3,13 +3,14 @@
 /*                                                        :::      ::::::::   */
 /*   ft_pwd.c                                           :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
+/*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/22 13:02:02 by adjoly            #+#    #+#             */
-/*   Updated: 2024/06/25 11:31:15 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/07/19 11:40:24 by mmoussou         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
+#include "minishell.h"
 #include <unistd.h>
 #include "env.h"
 #include "libft.h"
@@ -21,4 +22,5 @@ void	ft_pwd(void)
 
 	pwd = ret_cwd();
 	ft_putendl_fd(pwd, STDOUT_FILENO);
+	get_exit_code(0);
 }
diff --git a/src/builtins/ft_unset.c b/src/builtins/ft_unset.c
index b631257..5f8768f 100644
--- a/src/builtins/ft_unset.c
+++ b/src/builtins/ft_unset.c
@@ -6,7 +6,7 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/25 16:45:04 by mmoussou          #+#    #+#             */
-/*   Updated: 2024/07/16 13:35:38 by mmoussou         ###   ########.fr       */
+/*   Updated: 2024/07/19 11:36:00 by mmoussou         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -28,11 +28,6 @@ void	ft_unset_arg(char *arg, t_env *env)
 {
 	t_env	*tmp;
 
-	if (!arg)
-	{
-		printf("unset: not enough arguments");
-		return ;
-	}
 	if (!ft_strcmp(env->name, arg))
 	{
 		pop_first_el(env);
@@ -59,4 +54,5 @@ void	ft_unset(char **args, t_env *env)
 		ft_unset_arg(*args, env);
 		args++;
 	}
+	get_exit_code(0);
 }