diff --git a/inc/environment.h b/inc/environment.h
index b141207..67e2920 100644
--- a/inc/environment.h
+++ b/inc/environment.h
@@ -6,7 +6,7 @@
 /*   By: whaffman <whaffman@student.codam.nl>         +#+                     */
 /*                                                   +#+                      */
 /*   Created: 2025/02/04 16:26:35 by whaffman      #+#    #+#                 */
-/*   Updated: 2025/03/03 21:32:49 by whaffman      ########   odam.nl         */
+/*   Updated: 2025/03/04 16:30:03 by whaffman      ########   odam.nl         */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -17,7 +17,7 @@
 
 void			environment_add(t_minishell *msh,
 					char *name, char *value);
-void			environment_print(t_minishell *msh);
+void			environment_print(t_minishell *msh, int export);
 t_environment	*environment_get(t_minishell *msh, char *name);
 void			environment_free_list(t_minishell *msh);
 int				environment_parse(t_minishell *msh, char **envp);
diff --git a/src/builtin/builtin_env.c b/src/builtin/builtin_env.c
index 2b92fa8..882f74f 100644
--- a/src/builtin/builtin_env.c
+++ b/src/builtin/builtin_env.c
@@ -6,7 +6,7 @@
 /*   By: whaffman <whaffman@student.codam.nl>         +#+                     */
 /*                                                   +#+                      */
 /*   Created: 2025/02/20 11:33:02 by whaffman      #+#    #+#                 */
-/*   Updated: 2025/02/26 15:46:55 by whaffman      ########   odam.nl         */
+/*   Updated: 2025/03/04 16:33:16 by whaffman      ########   odam.nl         */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -15,6 +15,6 @@
 int	builtin_env(t_minishell *msh, t_command *cmd)
 {
 	(void)cmd;
-	environment_print(msh);
+	environment_print(msh, FALSE);
 	return (SUCCESS);
 }
diff --git a/src/builtin/builtin_export.c b/src/builtin/builtin_export.c
index a9f7b31..1bc80eb 100644
--- a/src/builtin/builtin_export.c
+++ b/src/builtin/builtin_export.c
@@ -6,7 +6,7 @@
 /*   By: whaffman <whaffman@student.codam.nl>         +#+                     */
 /*                                                   +#+                      */
 /*   Created: 2025/02/20 11:32:53 by whaffman      #+#    #+#                 */
-/*   Updated: 2025/03/03 23:00:38 by whaffman      ########   odam.nl         */
+/*   Updated: 2025/03/04 16:31:48 by whaffman      ########   odam.nl         */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -33,6 +33,8 @@ int	builtin_export(t_minishell *msh, t_command *cmd)
 
 	i = 0;
 	arr = NULL;
+	if (cmd->args[1] == NULL)
+		environment_print(msh, TRUE);
 	while (cmd->args[++i] != NULL)
 	{
 		arr = ft_split_safe(msh, cmd->args[i], '=');
diff --git a/src/environment/environment_print.c b/src/environment/environment_print.c
index 8b60aab..5fcdfb7 100644
--- a/src/environment/environment_print.c
+++ b/src/environment/environment_print.c
@@ -6,23 +6,25 @@
 /*   By: willem <willem@student.codam.nl>             +#+                     */
 /*                                                   +#+                      */
 /*   Created: 2025/02/08 13:52:08 by willem        #+#    #+#                 */
-/*   Updated: 2025/03/01 14:24:19 by whaffman      ########   odam.nl         */
+/*   Updated: 2025/03/04 16:29:49 by whaffman      ########   odam.nl         */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "minishell.h"
 
-void	environment_print(t_minishell *msh)
+void	environment_print(t_minishell *msh, int export)
 {
-	char	**arr;
-	int		i;
+	t_list			*env_list;
+	t_environment	*env;
 
-	arr = environment_get_arr(msh);
-	i = 0;
-	while (arr[i] != NULL)
+	env_list = msh->environment;
+	while(env_list != NULL)
 	{
-		printf("%s\n", arr[i]);
-		i++;
+		env = (t_environment *)env_list->content;
+		if (export)
+			printf("declare -x %s=\"%s\"\n", env->name, env->value);
+		else
+			printf("%s=%s\n", env->name, env->value);
+		env_list = env_list->next;
 	}
-	ft_free_arr_safe(msh, arr);
 }