diff --git a/data/enemies/macaronni_ted.ani b/data/enemies/robot.ani
similarity index 100%
rename from data/enemies/macaronni_ted.ani
rename to data/enemies/robot.ani
diff --git a/data/enemies/macaronni_ted.png b/data/enemies/robot.png
similarity index 100%
rename from data/enemies/macaronni_ted.png
rename to data/enemies/robot.png
diff --git a/data/enemies/upv_student.ani b/data/enemies/upv_student.ani
index 18b077b..b5e817c 100644
--- a/data/enemies/upv_student.ani
+++ b/data/enemies/upv_student.ani
@@ -3,7 +3,7 @@ frameHeight=16
 
 [animation]
 name=default
-speed=6
+speed=8
 loop=0
-frames=0,1,2,4
+frames=0,1,2,3
 [/animation]
\ No newline at end of file
diff --git a/data/enemies/upv_student.png b/data/enemies/upv_student.png
index 2c559d6..29fad5f 100644
Binary files a/data/enemies/upv_student.png and b/data/enemies/upv_student.png differ
diff --git a/data/room/02.room b/data/room/02.room
index 0f038b7..79d7f0b 100644
--- a/data/room/02.room
+++ b/data/room/02.room
@@ -27,8 +27,8 @@ color=green
 [/enemy]
 
 [enemy]
-tileSetFile=batman.png
-animation=batman.ani
+tileSetFile=upv_student.png
+animation=upv_student.ani
 width=8
 height=16
 x=4
@@ -39,7 +39,7 @@ x1=4
 y1=13
 x2=19
 y2=13
-color=white
+color=cyan
 flip=true
 [/enemy]
 
diff --git a/data/room/04.tmx b/data/room/04.tmx
index 764c456..32b46f7 100644
--- a/data/room/04.tmx
+++ b/data/room/04.tmx
@@ -3,21 +3,21 @@
  <tileset firstgid="1" source="standard.tsx"/>
  <layer id="1" name="Capa de patrones 1" width="32" height="16">
   <data encoding="csv">
-15,15,15,15,15,15,15,15,15,15,15,15,15,0,0,0,0,0,0,0,0,0,0,528,15,15,15,15,15,15,15,15,
-15,15,15,15,15,15,15,15,15,15,15,15,0,0,0,0,0,0,0,0,0,0,528,0,15,15,15,15,15,15,15,15,
-15,15,15,0,0,0,0,15,15,15,15,0,0,0,0,0,0,0,0,0,0,528,0,0,15,15,15,15,15,15,15,15,
-15,15,0,0,0,0,0,0,15,15,0,0,0,0,0,0,0,0,0,0,528,0,0,0,15,15,15,15,15,15,15,15,
-15,15,0,0,0,0,0,0,15,15,0,0,0,0,0,0,0,0,0,528,0,0,0,0,15,15,15,15,15,15,15,15,
-15,15,0,0,0,0,0,0,15,15,0,0,0,0,0,0,0,0,528,0,0,0,0,0,15,15,15,15,15,15,15,15,
-15,15,0,0,0,0,0,0,15,15,0,0,0,0,0,0,0,528,0,0,0,0,0,0,15,15,15,15,15,0,0,0,
-15,15,0,0,0,0,415,415,15,15,0,0,0,415,415,415,415,0,0,0,0,0,0,0,15,15,15,15,0,0,0,0,
+189,190,189,190,189,190,189,190,189,190,189,190,189,190,189,190,189,190,189,191,0,0,0,528,189,190,189,190,189,190,189,190,
+15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,0,0,0,0,0,528,0,15,15,15,15,15,15,15,15,
+15,15,15,0,0,0,0,15,15,15,15,15,15,15,302,0,0,0,0,0,0,528,0,0,15,15,15,15,15,15,15,15,
+15,15,0,0,0,0,0,302,15,15,15,15,15,0,0,0,0,0,0,0,528,0,0,0,15,15,15,15,15,15,15,15,
+15,15,0,0,0,0,0,0,15,15,15,15,0,0,0,0,0,0,0,528,0,0,0,0,15,15,15,15,15,15,15,15,
+15,15,0,0,0,0,0,0,15,15,15,0,0,0,0,0,0,0,528,0,0,0,0,0,15,15,15,15,15,15,15,15,
+15,15,0,0,0,0,0,0,15,15,0,0,0,0,0,0,0,528,0,0,0,0,0,0,15,15,15,15,15,302,0,0,
+15,15,0,0,0,0,415,415,15,15,0,0,0,415,415,415,415,0,0,0,0,0,0,0,15,15,15,15,302,0,0,0,
 15,15,0,0,0,0,0,0,15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,15,15,15,15,0,0,0,0,0,
-15,15,415,0,0,0,0,0,15,15,415,415,552,0,0,0,0,0,0,0,0,0,15,15,15,15,0,0,0,0,0,0,
-15,15,0,0,0,0,415,415,15,15,0,0,0,552,0,0,0,0,0,0,0,15,15,15,15,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,552,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,415,415,0,0,0,0,0,0,0,0,0,0,0,552,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,552,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,519,15,63,15,63,543,0,0,0,0,0,0,0,0,0,552,0,0,0,0,0,519,15,63,15,63,15,63,15,63,
+15,15,415,0,0,0,0,0,15,15,415,415,415,552,0,0,0,0,0,0,0,0,15,15,15,15,0,0,0,0,0,0,
+15,15,0,0,0,0,415,415,15,15,0,0,0,0,552,0,0,0,0,0,0,15,15,15,15,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,552,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,415,415,0,0,0,0,0,0,0,0,0,0,0,0,552,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,552,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,519,15,63,15,63,543,0,0,0,0,0,0,0,0,0,0,552,0,0,0,0,519,15,63,15,63,15,63,15,63,
 63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63
 </data>
  </layer>