diff --git a/srcs/cmd_cd.c b/srcs/cmd_cd.c
index 895a690..6563093 100644
--- a/srcs/cmd_cd.c
+++ b/srcs/cmd_cd.c
@@ -6,7 +6,7 @@
 /*   By: tmaze <tmaze@student.42.fr>                +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/09/20 14:42:42 by tmaze             #+#    #+#             */
-/*   Updated: 2019/10/17 10:59:38 by tmaze            ###   ########.fr       */
+/*   Updated: 2019/11/03 00:39:59 by tmaze            ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/srcs/cmd_echo.c b/srcs/cmd_echo.c
index 3cc9225..1f84d1e 100644
--- a/srcs/cmd_echo.c
+++ b/srcs/cmd_echo.c
@@ -6,7 +6,7 @@
 /*   By: tmaze <tmaze@student.42.fr>                +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/09/20 14:42:30 by tmaze             #+#    #+#             */
-/*   Updated: 2019/10/17 10:58:52 by tmaze            ###   ########.fr       */
+/*   Updated: 2019/11/02 23:04:23 by tmaze            ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,7 +14,12 @@
 
 int	cmd_echo(char **argv, t_env **env)
 {
-	(void)argv;
 	(void)env;
+	int	i;
+
+	i = 1;
+	while (argv[i])
+		ft_printf("%s ", argv[i++]);
+	ft_putchar('\n');
 	return (0);
 }
diff --git a/srcs/cmd_setenv.c b/srcs/cmd_setenv.c
index c4c24e6..55498d1 100644
--- a/srcs/cmd_setenv.c
+++ b/srcs/cmd_setenv.c
@@ -6,7 +6,7 @@
 /*   By: tmaze <tmaze@student.42.fr>                +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/09/20 14:41:08 by tmaze             #+#    #+#             */
-/*   Updated: 2019/10/17 09:59:40 by tmaze            ###   ########.fr       */
+/*   Updated: 2019/11/02 23:10:32 by tmaze            ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -28,7 +28,7 @@ int	cmd_setenv(char **argv, t_env **env)
 	}
 	else
 	{
-		printf("usage: setenv [KEY]=[value]\n");
+		ft_printf("usage: setenv [KEY]=[value]\n");
 		return (1);
 	}
 }