diff --git a/cpp00/ex00/megaphone.cpp b/cpp00/ex00/megaphone.cpp
index 904a992..df6a6d0 100644
--- a/cpp00/ex00/megaphone.cpp
+++ b/cpp00/ex00/megaphone.cpp
@@ -6,17 +6,18 @@
 /*   By: rparodi <rparodi@student.42.fr>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/06 16:08:46 by rparodi           #+#    #+#             */
-/*   Updated: 2024/09/03 18:22:21 by rparodi          ###   ########.fr       */
+/*   Updated: 2024/12/17 22:45:02 by rparodi          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include <cctype>
 #include <cstdio>
 #include <iostream>
+#include <string>
 
 std::string str_toupper(std::string str)
 {
-	for (size_t i = 0; str[i] != '\0'; i++)
+	for (size_t i = 0; i < str.length(); i++)
 		str[i] = std::toupper(str[i]);
 	return (str);
 }
@@ -24,13 +25,8 @@ std::string str_toupper(std::string str)
 int	main(int argc, char *argv[])
 {
 	if (argc > 1)
-	{
-		for (int i = 1; i < argc; i++){
+		for (int i = 1; i < argc; i++)
 			std::cout << str_toupper(argv[i]);
-			if (i + 1 != argc)
-				std::cout << " ";
-		}
-	}
 	else
 		std::cout << "* LOUD AND UNBEARABLE FEEDBACK NOISE *";
 	std::cout << std::endl;