diff --git a/data/animations.lua b/data/animations.lua
index 04f94b8..823bc6a 100644
--- a/data/animations.lua
+++ b/data/animations.lua
@@ -3,34 +3,34 @@ animations = {
     ["hero_stand"] = {
         cycle = {1},
         frames = {
-            { frame={x=0,y=0,w=16,h=17}, wait=2 },
+            { frame={x=0,y=0,w=16,h=17}, wait=4 },
         }
     },
     ["hero_jump"] = {
         cycle = {1},
         frames = {
-            { frame={x=32,y=0,w=16,h=17}, wait=2 },
+            { frame={x=32,y=0,w=16,h=17}, wait=4 },
         }
     },
     ["hero_walk"] = {
         cycle = {1,2,1,3},
         frames = {
-            { frame={x=0,y=0,w=16,h=17}, wait=2 },
-            { frame={x=16,y=0,w=16,h=17}, wait=2 },
-            { frame={x=32,y=0,w=16,h=17}, wait=2 }
+            { frame={x=0,y=0,w=16,h=17}, wait=4 },
+            { frame={x=16,y=0,w=16,h=17}, wait=4 },
+            { frame={x=32,y=0,w=16,h=17}, wait=4 }
         }
     },
     ["hero_stairs_idle"] = {
         cycle = {1},
         frames = {
-            { frame={x=48,y=0,w=16,h=17}, wait=2 }
+            { frame={x=48,y=0,w=16,h=17}, wait=4 }
         }
     },
     ["hero_stairs"] = {
         cycle = {1,2},
         frames = {
-            { frame={x=48,y=0,w=16,h=17}, wait=2 },
-            { frame={x=48,y=0,w=16,h=17}, wait=2, reversed=true }
+            { frame={x=48,y=0,w=16,h=17}, wait=4 },
+            { frame={x=48,y=0,w=16,h=17}, wait=4, reversed=true }
         }
     },
 }
\ No newline at end of file
diff --git a/data/editor.lua b/data/editor.lua
index 2b9e691..49a31e3 100644
--- a/data/editor.lua
+++ b/data/editor.lua
@@ -86,8 +86,9 @@ editor = {
             rooms.pos.y = rooms.pos.y - 12
         elseif key.press(key.TAB) or key.press(key.ESCAPE) then
             editor.picker.show()
-        elseif key.press(key.Q) then
-            msgbox.show("IE MEN!", {"Hi ha canvis sense guardar.", "Vols guardar-los abans d'eixir?"}, { {"Cancel", app.pop}, {"No", function() sys.quit() end}, {"Yes", sys.quit} } )
+        elseif key.press(key.P) then
+            sprites.hero.pos.x = tx*8-4 
+            sprites.hero.pos.y = ty*8-9
         end
     end,
 
diff --git a/data/rooms.lua b/data/rooms.lua
index 38f6f11..844d3e2 100644
--- a/data/rooms.lua
+++ b/data/rooms.lua
@@ -13,10 +13,10 @@ rooms = {
 	surf_items = nil,
 	surf_original_items = nil,
 	visibility = LAYER_ALL,
-	pos = {x=0, y=0},
+	pos = {x=0, y=4*12},
 
 	init = function()
-		rooms.pos.x, rooms.pos.y = 0,0
+		rooms.pos.x, rooms.pos.y = 0,4*12
 		if rooms.surf_background ~= nil then surf.free(rooms.surf_background) end
 		rooms.surf_background = surf.load("rooms_background.bin")
 		--rooms.surf_background = surf.new(20*8,12*8)
diff --git a/data/rooms_background.bin b/data/rooms_background.bin
index a3fb1ca..6603363 100644
Binary files a/data/rooms_background.bin and b/data/rooms_background.bin differ
diff --git a/data/rooms_foreground.bin b/data/rooms_foreground.bin
index 67dcc18..398477f 100644
Binary files a/data/rooms_foreground.bin and b/data/rooms_foreground.bin differ
diff --git a/data/sprites.lua b/data/sprites.lua
index eb7f37c..b2d90e4 100644
--- a/data/sprites.lua
+++ b/data/sprites.lua
@@ -6,7 +6,7 @@ sprites = {
 
     init = function()
         sprites.hero = {
-            pos = { x=24, y=15 },
+            pos = { x=28, y=4*12*8+71 },
             size= { w=16, h=17 },
             bbo = { left=0, top=0, right=0, bottom=0 },
             flipped = false,
@@ -54,6 +54,8 @@ sprites = {
     end,
 
     update_hero = function()
+        if not sys.beat() then return end
+
         -- Update hero
         local anim = "hero_stand"
         local move_anim = "hero_walk"
@@ -61,15 +63,18 @@ sprites = {
         -- SI ESTÀ BOTANT...
         if sprites.hero.jumping > 0 then
             anim = "hero_jump"
+            move_anim = "hero_jump"
             local tx1, tx2, ty = (sprites.hero.pos.x+4)>>3, (sprites.hero.pos.x+11)>>3, (sprites.hero.pos.y)>>3
+            --draw.rect(tx1<<3,ty<<3,8,8,8)
+            --draw.rect(tx2<<3,ty<<3,8,8,28)
             if map.tile(tx1,ty) == 0 and map.tile(tx2,ty) == 0 then
                 if ty<rooms.pos.y then
                     game.change_room(0,-1)
                 else
-                    sprites.hero.pos.y = sprites.hero.pos.y - 2
+                    if sprites.hero.jumping > 1 then sprites.hero.pos.y = sprites.hero.pos.y - 1 end
                 end
             end
-            sprites.hero.jumping = sprites.hero.jumping - 2
+            sprites.hero.jumping = sprites.hero.jumping - 1
         else
         -- SI NO ESTÀ BOTANT...
             -- SI ESTÀ EN UNES ESCALERES...
@@ -129,7 +134,7 @@ sprites = {
                     end
                     -- SI POLSA SPACE...
                     if key.down(key.SPACE) then
-                        sprites.hero.jumping = 16
+                        sprites.hero.jumping = 17
                     end
                 end
             end
@@ -149,7 +154,7 @@ sprites = {
         elseif key.down(key.RIGHT) then
             sprites.hero.flipped = false
             anim = move_anim
-            local tx, ty = (sprites.hero.pos.x+13)>>3, (sprites.hero.pos.y+16)>>3
+            local tx, ty = (sprites.hero.pos.x+12)>>3, (sprites.hero.pos.y+16)>>3
             if map.tile(tx,ty) < 16 and map.tile(tx,ty-1) < 16 then
                 if tx>rooms.pos.x+19 then
                     game.change_room(1,0)
diff --git a/data/tiles.gif b/data/tiles.gif
index f4153c4..7e21f4b 100644
Binary files a/data/tiles.gif and b/data/tiles.gif differ