diff --git a/game/main.lua b/game/main.lua
index 13a62ba..fc4d77d 100644
--- a/game/main.lua
+++ b/game/main.lua
@@ -69,11 +69,11 @@ function love.draw()
     love.graphics.clear()
     love.graphics.setFont(bf)
 
-    -- tilemap.offsetX = math.floor(mapX)
-    -- tilemap.offsetY = math.floor(mapY)
-    local time = love.timer.getTime()
-    tilemap.offsetX = 50 + math.floor(math.cos(time) * 25)
-    tilemap.offsetY = 50 + math.floor(math.sin(time) * 25)
+    tilemap.offsetX = math.floor(mapX)
+    tilemap.offsetY = math.floor(mapY)
+    -- local time = love.timer.getTime()
+    -- tilemap.offsetX = 50 + math.floor(math.cos(time) * 25)
+    -- tilemap.offsetY = 50 + math.floor(math.sin(time) * 25)
     tilemap:update()
     local tilemapPosX = tilemap.offsetX
     local tilemapPosY = tilemap.offsetY
diff --git a/game/tilemap.lua b/game/tilemap.lua
index e43eafd..40b046c 100644
--- a/game/tilemap.lua
+++ b/game/tilemap.lua
@@ -58,12 +58,16 @@ function TileMap:update()
 
     love.graphics.clear(0, 255, 0) -- TODO: debug
 
+    local spriteY = self.size * (iOffset - 1) - y
     for i = iOffset, iUpper do
+        local spriteX = self.size * (jOffset - 1) - x
         for j = jOffset, jUpper do
             local tileIndex = self.map[i][j]
-            love.graphics.draw(self.tiles[tileIndex], self.size * (j - 1) - x, self.size * (i - 1) - y)
-            -- love.graphics.print(tostring(tileIndex), self.size * (j - 1) - x, self.size * (i - 1) - y)
+            love.graphics.draw(self.tiles[tileIndex], spriteX, spriteY)
+            -- love.graphics.print(tostring(tileIndex), spriteX, spriteY)
+            spriteX = spriteX + self.size
         end
+        spriteY = spriteY + self.size
     end
 
     love.graphics.setBlendMode(prevBlendMode)