diff --git a/README.md b/README.md
index a7f4091..51f5a59 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,11 @@ cd MacroLibX
 make
 ```
 
+If you want to build using GCC you can add `TOOLCHAIN=gcc` to your `make` command
+```bash
+make TOOLCHAIN=gcc
+```
+
 ## 🔨 Compile your project
 
 To compile your project with MacroLibX, you just provide the shared library path in your compilation/linking command:
diff --git a/src/renderer/buffers/vk_buffer.cpp b/src/renderer/buffers/vk_buffer.cpp
index 99e4b77..a56522a 100644
--- a/src/renderer/buffers/vk_buffer.cpp
+++ b/src/renderer/buffers/vk_buffer.cpp
@@ -6,12 +6,13 @@
 /*   By: maldavid <kbz_8.dev@akel-engine.com>       +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/10/08 18:55:57 by maldavid          #+#    #+#             */
-/*   Updated: 2023/11/14 07:17:06 by maldavid         ###   ########.fr       */
+/*   Updated: 2023/11/14 07:35:22 by maldavid         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "vk_buffer.h"
 #include <renderer/command/vk_cmd_pool.h>
+#include <renderer/command/vk_cmd_buffer.h>
 #include <renderer/core/render_core.h>
 #include <vma.h>
 #include <cstring>
@@ -89,39 +90,19 @@ namespace mlx
 
 		CmdPool cmdpool;
 		cmdpool.init();
-		auto device = Render_Core::get().getDevice().get();
+		CmdBuffer cmdBuffer;
+		cmdBuffer.init(&cmdpool);
 
-		VkCommandBufferAllocateInfo allocInfo{};
-		allocInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO;
-		allocInfo.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
-		allocInfo.commandPool = cmdpool.get();
-		allocInfo.commandBufferCount = 1;
-
-		VkCommandBuffer commandBuffer;
-		vkAllocateCommandBuffers(device, &allocInfo, &commandBuffer);
-
-		VkCommandBufferBeginInfo beginInfo{};
-		beginInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
-		beginInfo.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT;
-
-		vkBeginCommandBuffer(commandBuffer, &beginInfo);
+		cmdBuffer.beginRecord(VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT);
 
 		VkBufferCopy copyRegion{};
 		copyRegion.size = _size;
-		vkCmdCopyBuffer(commandBuffer, _buffer, newBuffer._buffer, 1, &copyRegion);
+		vkCmdCopyBuffer(cmdBuffer.get(), _buffer, newBuffer._buffer, 1, &copyRegion);
 
-		vkEndCommandBuffer(commandBuffer);
-
-		VkSubmitInfo submitInfo{};
-		submitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
-		submitInfo.commandBufferCount = 1;
-		submitInfo.pCommandBuffers = &commandBuffer;
-
-		auto graphicsQueue = Render_Core::get().getQueue().getGraphic();
-
-		vkQueueSubmit(graphicsQueue, 1, &submitInfo, VK_NULL_HANDLE);
-		vkQueueWaitIdle(graphicsQueue);
+		cmdBuffer.endRecord();
+		cmdBuffer.submitIdle();
 
+		cmdBuffer.destroy();
 		cmdpool.destroy();
 
 		this->swap(newBuffer);