diff --git a/src/tools/loader.cpp b/src/tools/loader.cpp
index 9eabf29..70a9be5 100644
--- a/src/tools/loader.cpp
+++ b/src/tools/loader.cpp
@@ -5,7 +5,7 @@
 #include <image.h>
 #include "../resourcemanager.h"
 #include <SFML/Graphics/Image.hpp>
-#include <meshbuilder.h>
+#include <mesh.h>
 #include <phongmaterial.h>
 #include "../sparrowrenderer/src/texture.h"
 
@@ -77,7 +77,7 @@ std::vector<Mesh*> Loader::loadMesh(const std::string &filename){
         return meshes;
     }
 
-    MeshBuilder* currentMesh = new MeshBuilder();
+    Mesh* currentMesh = new Mesh();
     meshes.push_back(currentMesh);
     currentMesh->setMaterial(currentMat);
 
@@ -125,7 +125,7 @@ std::vector<Mesh*> Loader::loadMesh(const std::string &filename){
             std::sscanf(line.c_str(),"f %d/%d/%d %d/%d/%d %d/%d/%d",tab,tab+1,tab+2,tab+3,tab+4,tab+5,tab+6,tab+7,tab+8);
             //TODO: check sscanf success
 
-            int nb_vertices = currentMesh->positions.size();
+            int nb_vertices = currentMesh->positions3D.size();
 
             currentMesh->addTriangle(nb_vertices, nb_vertices+1, nb_vertices+2);
             for(int i=0; i<3; ++i)
@@ -133,7 +133,7 @@ std::vector<Mesh*> Loader::loadMesh(const std::string &filename){
                 if(norm.size() == 0)
                 {
                     if(tex.size() == 0)
-                        currentMesh->addPosition(pos[tab[i]-1]);
+                        currentMesh->addVertex(pos[tab[i]-1]);
                     else
                         currentMesh->addVertex(pos[tab[i]-1], tex[tab[i+1]-1]);
                 }
@@ -148,7 +148,7 @@ std::vector<Mesh*> Loader::loadMesh(const std::string &filename){
         }
             break;
         case 'g':
-            currentMesh = new MeshBuilder();
+            currentMesh = new Mesh();
             meshes.push_back(currentMesh);
             currentMesh->setMaterial(currentMat);
             break;
diff --git a/src/tools/pathfinder.cpp b/src/tools/pathfinder.cpp
index 29277f7..f386b6d 100644
--- a/src/tools/pathfinder.cpp
+++ b/src/tools/pathfinder.cpp
@@ -66,7 +66,7 @@ std::vector<GraphNode*> PathFinder::a_star(GraphNode* start, GraphNode* goal, bo
     return backtrack_path(start,goal,pred);
 }
 
-std::vector<GraphNode*> PathFinder::a_star_min_max(GraphNode* start,GraphNode* goal,bool debug = false)
+std::vector<GraphNode*> PathFinder::a_star_min_max(GraphNode* start,GraphNode* goal,bool debug)
 {
     std::priority_queue<GraphNode*,std::vector<GraphNode*>,ComparePriority> frontier = std::priority_queue<GraphNode*,std::vector<GraphNode*>,ComparePriority>();
     std::map<GraphNode*, float> cost = std::map<GraphNode*, float>(); //cost of visited node