diff --git a/src/Application.cpp b/src/Application.cpp
index c4365d3..87dc8aa 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -15,6 +15,12 @@
 #endif
 
 Application::~Application()
+{
+	
+}
+
+
+void Application::Quit()
 {
 	ImGui_ImplOpenGL3_Shutdown();
 	ImGui_ImplGlfw_Shutdown();
@@ -23,7 +29,7 @@ Application::~Application()
 	for (Shape* shape : shapes)
 		delete shape;
 
-	if (window != nullptr) 
+	if (window != nullptr)
 	{
 		glfwDestroyWindow(window);
 		window = nullptr;
diff --git a/src/Application.hpp b/src/Application.hpp
index e4dbeae..b437a2b 100644
--- a/src/Application.hpp
+++ b/src/Application.hpp
@@ -35,6 +35,7 @@ private:
 
 public:
 	void Init(int width, int height, const std::string& title);
+	void Quit();
 	void Launch();
 
 private:
diff --git a/src/Shape.cpp b/src/Shape.cpp
index 208e289..17031bc 100644
--- a/src/Shape.cpp
+++ b/src/Shape.cpp
@@ -38,6 +38,11 @@ Shape::Shape()
 	}
 }
 
+Shape::~Shape()
+{
+	lol::ShaderManager::GetInstance().Return(SHAPE_ID);
+}
+
 void Shape::PreRender(const lol::CameraBase& camera) const
 {
 	shader->SetUniform("model", transformation);
@@ -80,6 +85,11 @@ Cube::Cube()
 	}
 }
 
+Cube::~Cube()
+{
+	lol::VAOManager::GetInstance().Return(CUBE_ID);
+}
+
 Pyramid::Pyramid()
 {
 	vao = lol::VAOManager::GetInstance().Get(PYRAMID_ID);
@@ -110,4 +120,9 @@ Pyramid::Pyramid()
 		vao = std::make_shared<lol::VertexArray>(vbo, ebo);
 		lol::VAOManager::GetInstance().Register(PYRAMID_ID, vao);
 	}
-}
\ No newline at end of file
+}
+
+Pyramid::~Pyramid()
+{
+	lol::VAOManager::GetInstance().Return(PYRAMID_ID);
+}
diff --git a/src/Shapes.hpp b/src/Shapes.hpp
index 29ee0eb..743aff8 100644
--- a/src/Shapes.hpp
+++ b/src/Shapes.hpp
@@ -6,6 +6,7 @@ class Shape : public lol::Drawable, public lol::Transformable
 {
 public:
 	Shape();
+	virtual ~Shape();
 	void PreRender(const lol::CameraBase& camera) const override;
 };
 
@@ -14,10 +15,12 @@ class Cube : public Shape
 {
 public:
 	Cube();
+	~Cube();
 };
 
 class Pyramid : public Shape
 {
 public:
 	Pyramid();
+	~Pyramid();
 };
\ No newline at end of file
diff --git a/src/main.cpp b/src/main.cpp
index e523a6f..e5c3500 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -16,6 +16,7 @@ int main(int argc, char** argv)
 	}
 
 	app.Launch();
+	app.Quit();
 
 	return 0;
 }
\ No newline at end of file
diff --git a/vendor/lol b/vendor/lol
index 9629779..1610813 160000
--- a/vendor/lol
+++ b/vendor/lol
@@ -1 +1 @@
-Subproject commit 9629779b2a9db055a462b506daac2190a0db24fe
+Subproject commit 1610813bbe5e0f970cdf5bc18c30c1dc51cd6d07