diff --git a/include/map_utils.h b/include/map_utils.h
index 4e124d4..05cf2c9 100644
--- a/include/map_utils.h
+++ b/include/map_utils.h
@@ -18,4 +18,6 @@
 struct tile *get_tile_from_pos(struct vertex_component *map, gc_vector2 pos);
 struct tile *get_tile_at(struct vertex_component *v, gc_vector2i p);
 gc_vector2 gc_vector2_from_coords(float x, float y, float z);
-bool is_pos_in_tile(gc_vector2 pos, struct tile *tile);
\ No newline at end of file
+bool is_pos_in_tile(gc_vector2 pos, struct tile *tile);
+struct tile*get_selected_tile(struct sfml_renderer_system *this, \
+struct vertex_component *info, gc_vector2 pos);
\ No newline at end of file
diff --git a/src/isometry/map_utils.c b/src/isometry/map_utils.c
index dfe3a4d..469262c 100644
--- a/src/isometry/map_utils.c
+++ b/src/isometry/map_utils.c
@@ -64,4 +64,14 @@ sel->corners[i]->y, sel->corners[i]->z);
         }
     }
     return (i_stock);
+}
+
+struct tile*get_selected_tile(struct sfml_renderer_system *this, \
+struct vertex_component *info, gc_vector2 pos)
+{
+	sfVector2i v = sfMouse_getPosition((const sfWindow *) this->window);
+	sfVector2f w = sfRenderWindow_mapPixelToCoords(this->window, v, this->view);
+
+	w.y *= -1;
+	return (get_tile_from_pos(info, gc_vector2_add(pos, *(gc_vector2 *)&w)));
 }
\ No newline at end of file
diff --git a/src/sfml_renderer/sfml_vertex.c b/src/sfml_renderer/sfml_vertex.c
index d94b49a..fd84b69 100644
--- a/src/sfml_renderer/sfml_vertex.c
+++ b/src/sfml_renderer/sfml_vertex.c
@@ -80,24 +80,30 @@ bool hovered)
         sfVertexArray_getVertex(this->vertices, j)->color = colors[sel];
 }
 
+
+
 void sfmlrenderer_draw_tilemap(gc_engine *engine, gc_entity *entity, \
 struct vertex_component *info, float dt)
 {
     struct sfml_renderer_system *this = GETSYS(engine, sfml_renderer_system);
     struct transform_component *tra = GETCMP(entity, transform_component);
-    sfVector2i v = sfMouse_getPosition((const sfWindow *) this->window);
-    sfVector2f w = sfRenderWindow_mapPixelToCoords(this->window, v, this->view);
-    gc_vector2 pos = tra->position;
-    int i;
     struct tile *tl;
+    int width = 0;
+    int length = 0;
+    int end_diagonal = 0;
 
-    w.y *= -1;
     if (!info || !info->map)
         return;
-    tl = get_tile_from_pos(info, gc_vector2_add(pos, *(gc_vector2 *)&w));
-    for (i = 0; info->map[i].corners[0]; i++);
-    for (i--; i >= 0; i--) {
-        sfmlrenderer_manage_hovered_tile(this, &info->map[i] == tl);
-        sfmlrenderer_draw_tile(engine, pos, &info->map[i], dt);
-    }
+    tl = get_selected_tile(this, info, tra->position);
+	for (width = 0; info->vertices[0][width].z != INT32_MIN; width++);
+	for (length = 0; info->map[length].corners[0]; length++);
+	width--;
+	end_diagonal = length + width - 1;
+	for (int i = length - 1; i >= 0; i -= (i > length - width) ? 1 : width) {
+		end_diagonal -= (end_diagonal <= width) ? 1 : width;
+		for (int j = i; j >= end_diagonal; j -= width - 1) {
+			sfmlrenderer_manage_hovered_tile(this, &info->map[j] == tl);
+			sfmlrenderer_draw_tile(engine, tra->position, &info->map[j], dt);
+		}
+	}
 }
\ No newline at end of file