diff --git a/ex01/Cat/Cat.cpp b/ex01/Cat/Cat.cpp
index a2a51c4..4b3d60d 100644
--- a/ex01/Cat/Cat.cpp
+++ b/ex01/Cat/Cat.cpp
@@ -28,8 +28,7 @@ Cat::~Cat()
 Cat::Cat(const Cat &other) : Animal(other)
 {
     std::cout  << "Cat copied" <<  std::endl;
-    this->brain = NULL;
-    *this = other;
+    this->brain = new Brain(*other.brain);
 }
 
 Cat& Cat::operator=(const Cat &other)
diff --git a/ex01/Dog/Dog.cpp b/ex01/Dog/Dog.cpp
index abf6aad..dd81f2f 100644
--- a/ex01/Dog/Dog.cpp
+++ b/ex01/Dog/Dog.cpp
@@ -28,8 +28,7 @@ Dog::~Dog()
 Dog::Dog(const Dog &other) : Animal(other)
 {
     std::cout  << "Dog copied" <<  std::endl;
-    this->brain = NULL;
-    *this = other;
+    this->brain = new Brain(*other.brain);
 }
 
 Dog& Dog::operator=(const Dog &other)
diff --git a/ex01/WrongAnimal/WrongAnimal.cpp b/ex01/WrongAnimal/WrongAnimal.cpp
index 5573a0b..010efc6 100644
--- a/ex01/WrongAnimal/WrongAnimal.cpp
+++ b/ex01/WrongAnimal/WrongAnimal.cpp
@@ -1,12 +1,12 @@
 /* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
-/*   Animal.cpp                                        :+:      :+:    :+:   */
+/*   WrongAnimal.cpp                                    :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
 /*   By: aortigos <aortigos@student.42malaga.com    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2025/09/06 02:27:27 by aortigos          #+#    #+#             */
-/*   Updated: 2025/09/06 02:28:09 by aortigos         ###   ########.fr       */
+/*   Created: 2025/11/21 12:16:12 by aortigos          #+#    #+#             */
+/*   Updated: 2025/11/21 12:16:13 by aortigos         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/ex01/WrongAnimal/WrongAnimal.hpp b/ex01/WrongAnimal/WrongAnimal.hpp
index 1f54504..126272e 100644
--- a/ex01/WrongAnimal/WrongAnimal.hpp
+++ b/ex01/WrongAnimal/WrongAnimal.hpp
@@ -1,12 +1,12 @@
 /* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
-/*   Animal.hpp                                        :+:      :+:    :+:   */
+/*   WrongAnimal.hpp                                    :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
 /*   By: aortigos <aortigos@student.42malaga.com    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2025/09/06 02:27:27 by aortigos          #+#    #+#             */
-/*   Updated: 2025/09/06 02:28:09 by aortigos         ###   ########.fr       */
+/*   Created: 2025/11/21 12:16:15 by aortigos          #+#    #+#             */
+/*   Updated: 2025/11/21 12:16:16 by aortigos         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/ex01/WrongCat/WrongCat.cpp b/ex01/WrongCat/WrongCat.cpp
index 26045bc..e289815 100644
--- a/ex01/WrongCat/WrongCat.cpp
+++ b/ex01/WrongCat/WrongCat.cpp
@@ -1,12 +1,12 @@
 /* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
-/*   Animal.cpp                                        :+:      :+:    :+:   */
+/*   WrongCat.cpp                                       :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
 /*   By: aortigos <aortigos@student.42malaga.com    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2025/09/06 02:27:27 by aortigos          #+#    #+#             */
-/*   Updated: 2025/09/06 02:28:09 by aortigos         ###   ########.fr       */
+/*   Created: 2025/11/21 12:16:01 by aortigos          #+#    #+#             */
+/*   Updated: 2025/11/21 12:16:02 by aortigos         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/ex01/WrongCat/WrongCat.hpp b/ex01/WrongCat/WrongCat.hpp
index a383995..2cbba4a 100644
--- a/ex01/WrongCat/WrongCat.hpp
+++ b/ex01/WrongCat/WrongCat.hpp
@@ -1,12 +1,12 @@
 /* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
-/*   Animal.hpp                                        :+:      :+:    :+:   */
+/*   WrongCat.hpp                                       :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
 /*   By: aortigos <aortigos@student.42malaga.com    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2025/09/06 02:27:27 by aortigos          #+#    #+#             */
-/*   Updated: 2025/09/06 02:28:09 by aortigos         ###   ########.fr       */
+/*   Created: 2025/11/21 12:16:05 by aortigos          #+#    #+#             */
+/*   Updated: 2025/11/21 12:16:06 by aortigos         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/ex02/Cat/Cat.cpp b/ex02/Cat/Cat.cpp
index a2a51c4..4b3d60d 100644
--- a/ex02/Cat/Cat.cpp
+++ b/ex02/Cat/Cat.cpp
@@ -28,8 +28,7 @@ Cat::~Cat()
 Cat::Cat(const Cat &other) : Animal(other)
 {
     std::cout  << "Cat copied" <<  std::endl;
-    this->brain = NULL;
-    *this = other;
+    this->brain = new Brain(*other.brain);
 }
 
 Cat& Cat::operator=(const Cat &other)
diff --git a/ex02/Dog/Dog.cpp b/ex02/Dog/Dog.cpp
index abf6aad..dd81f2f 100644
--- a/ex02/Dog/Dog.cpp
+++ b/ex02/Dog/Dog.cpp
@@ -28,8 +28,7 @@ Dog::~Dog()
 Dog::Dog(const Dog &other) : Animal(other)
 {
     std::cout  << "Dog copied" <<  std::endl;
-    this->brain = NULL;
-    *this = other;
+    this->brain = new Brain(*other.brain);
 }
 
 Dog& Dog::operator=(const Dog &other)
diff --git a/ex02/WrongAnimal/WrongAnimal.cpp b/ex02/WrongAnimal/WrongAnimal.cpp
index 5573a0b..13850d9 100644
--- a/ex02/WrongAnimal/WrongAnimal.cpp
+++ b/ex02/WrongAnimal/WrongAnimal.cpp
@@ -1,12 +1,12 @@
 /* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
-/*   Animal.cpp                                        :+:      :+:    :+:   */
+/*   WrongAnimal.cpp                                    :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
 /*   By: aortigos <aortigos@student.42malaga.com    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2025/09/06 02:27:27 by aortigos          #+#    #+#             */
-/*   Updated: 2025/09/06 02:28:09 by aortigos         ###   ########.fr       */
+/*   Created: 2025/11/21 11:43:54 by aortigos          #+#    #+#             */
+/*   Updated: 2025/11/21 11:44:39 by aortigos         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,12 +14,12 @@
 
 WrongAnimal::WrongAnimal() : type("WrongAnimal")
 {
-    std::cout << "Animal has been created" << std::endl;
+    std::cout << "WrongAnimal has been created" << std::endl;
 }
 
 WrongAnimal::~WrongAnimal()
 {
-    std::cout << "Animal has been destroyed" << std::endl;
+    std::cout << "WrongAnimal has been destroyed" << std::endl;
 }
 
 WrongAnimal::WrongAnimal(const WrongAnimal &other)
diff --git a/ex02/WrongAnimal/WrongAnimal.hpp b/ex02/WrongAnimal/WrongAnimal.hpp
index 1f54504..2e8a3fa 100644
--- a/ex02/WrongAnimal/WrongAnimal.hpp
+++ b/ex02/WrongAnimal/WrongAnimal.hpp
@@ -1,12 +1,12 @@
 /* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
-/*   Animal.hpp                                        :+:      :+:    :+:   */
+/*   WrongAnimal.hpp                                    :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
 /*   By: aortigos <aortigos@student.42malaga.com    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2025/09/06 02:27:27 by aortigos          #+#    #+#             */
-/*   Updated: 2025/09/06 02:28:09 by aortigos         ###   ########.fr       */
+/*   Created: 2025/11/21 11:43:58 by aortigos          #+#    #+#             */
+/*   Updated: 2025/11/21 11:44:00 by aortigos         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/ex02/WrongCat/WrongCat.cpp b/ex02/WrongCat/WrongCat.cpp
index 26045bc..6ed7f10 100644
--- a/ex02/WrongCat/WrongCat.cpp
+++ b/ex02/WrongCat/WrongCat.cpp
@@ -1,12 +1,12 @@
 /* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
-/*   Animal.cpp                                        :+:      :+:    :+:   */
+/*   WrongCat.cpp                                       :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
 /*   By: aortigos <aortigos@student.42malaga.com    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2025/09/06 02:27:27 by aortigos          #+#    #+#             */
-/*   Updated: 2025/09/06 02:28:09 by aortigos         ###   ########.fr       */
+/*   Created: 2025/11/21 11:44:04 by aortigos          #+#    #+#             */
+/*   Updated: 2025/11/21 11:44:48 by aortigos         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,13 +14,13 @@
 
 WrongCat::WrongCat() : WrongAnimal()
 {
-    std::cout << "Cat has been created" << std::endl;
+    std::cout << "WrongCat has been created" << std::endl;
     this->type = "WrongCat";
 }
 
 WrongCat::~WrongCat()
 {
-    std::cout << "Cat has been destroyed" << std::endl;
+    std::cout << "WrongCat has been destroyed" << std::endl;
 }
 
 WrongCat::WrongCat(const WrongCat &other) : WrongAnimal(other)
diff --git a/ex02/WrongCat/WrongCat.hpp b/ex02/WrongCat/WrongCat.hpp
index a383995..3d37eb8 100644
--- a/ex02/WrongCat/WrongCat.hpp
+++ b/ex02/WrongCat/WrongCat.hpp
@@ -1,12 +1,12 @@
 /* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
-/*   Animal.hpp                                        :+:      :+:    :+:   */
+/*   WrongCat.hpp                                       :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
 /*   By: aortigos <aortigos@student.42malaga.com    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2025/09/06 02:27:27 by aortigos          #+#    #+#             */
-/*   Updated: 2025/09/06 02:28:09 by aortigos         ###   ########.fr       */
+/*   Created: 2025/11/21 11:44:07 by aortigos          #+#    #+#             */
+/*   Updated: 2025/11/21 11:44:08 by aortigos         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */