diff --git a/source/App/Minecraft.cpp b/source/App/Minecraft.cpp
index e771cb2..10fde24 100644
--- a/source/App/Minecraft.cpp
+++ b/source/App/Minecraft.cpp
@@ -592,7 +592,7 @@ void Minecraft::init()
 	m_pGameRenderer = new GameRenderer(this);
 	m_pParticleEngine = new ParticleEngine(m_pLevel, m_pTextures);
 	m_pUser = new User("TestUser", "");
-	m_pGameMode = new SurvivalMode(this);
+	m_pGameMode = new CreativeMode(this);
 
 	reloadOptions();
 
diff --git a/source/App/Minecraft.hpp b/source/App/Minecraft.hpp
index 68a6183..bc0a5e0 100644
--- a/source/App/Minecraft.hpp
+++ b/source/App/Minecraft.hpp
@@ -18,7 +18,7 @@
 #include "Level.hpp"
 #include "CThread.hpp"
 #include "LocalPlayer.hpp"
-#include "SurvivalMode.hpp"
+#include "CreativeMode.hpp"
 #include "ITurnInput.hpp"
 #include "EntityRenderDispatcher.hpp"
 #include "ParticleEngine.hpp"
diff --git a/source/GameMode/SurvivalMode.cpp b/source/GameMode/CreativeMode.cpp
similarity index 79%
rename from source/GameMode/SurvivalMode.cpp
rename to source/GameMode/CreativeMode.cpp
index 14e2d5f..95b2774 100644
--- a/source/GameMode/SurvivalMode.cpp
+++ b/source/GameMode/CreativeMode.cpp
@@ -6,43 +6,33 @@
 	SPDX-License-Identifier: BSD-1-Clause
  ********************************************************************/
 
-#include "SurvivalMode.hpp"
+#include "CreativeMode.hpp"
 #include "Minecraft.hpp"
 
-SurvivalMode::SurvivalMode(Minecraft* pMC) : GameMode(pMC)
+CreativeMode::CreativeMode(Minecraft* pMC) : GameMode(pMC)
 {
 
 }
 
-void SurvivalMode::initPlayer(Player* p)
+void CreativeMode::initPlayer(Player* p)
 {
 	p->m_yaw = -180.0;
 }
 
-void SurvivalMode::startDestroyBlock(int x, int y, int z, int i)
+void CreativeMode::startDestroyBlock(int x, int y, int z, int i)
 {
 	TileID tile = m_pMinecraft->m_pLevel->getTile(x, y, z);
 
 	if (tile <= 0)
 		return;
 
-#ifdef ENH_INSTA_BREAK
-	destroyBlock(x, y, z, i);
-	return;
-#endif
-
-	if (field_18 == 0.0f)
-	{
-		Tile::tiles[tile]->attack(m_pMinecraft->m_pLevel, x, y, z, m_pMinecraft->m_pLocalPlayer);
-	}
-
-	if (Tile::tiles[tile]->getDestroyProgress(m_pMinecraft->m_pLocalPlayer) >= 1.0f)
-	{
+	if (m_pMinecraft->m_pLocalPlayer->canDestroy(Tile::tiles[tile]))
 		destroyBlock(x, y, z, i);
-	}
+
+	return;
 }
 
-bool SurvivalMode::destroyBlock(int x, int y, int z, int i)
+bool CreativeMode::destroyBlock(int x, int y, int z, int i)
 {
 	m_pMinecraft->m_pParticleEngine->destroy(x, y, z);
 
@@ -68,7 +58,7 @@ bool SurvivalMode::destroyBlock(int x, int y, int z, int i)
 	return true;
 }
 
-void SurvivalMode::continueDestroyBlock(int x, int y, int z, int i)
+void CreativeMode::continueDestroyBlock(int x, int y, int z, int i)
 {
 	if (field_24 > 0)
 	{
@@ -114,18 +104,18 @@ void SurvivalMode::continueDestroyBlock(int x, int y, int z, int i)
 	}
 }
 
-void SurvivalMode::stopDestroyBlock()
+void CreativeMode::stopDestroyBlock()
 {
 	field_18 = 0.0f;
 	field_24 = 0;
 }
 
-void SurvivalMode::tick()
+void CreativeMode::tick()
 {
 	field_1C = field_18;
 }
 
-void SurvivalMode::render(float f)
+void CreativeMode::render(float f)
 {
 	if (field_18 <= 0.0f)
 	{
@@ -140,17 +130,17 @@ void SurvivalMode::render(float f)
 	}
 }
 
-float SurvivalMode::getPickRange()
+float CreativeMode::getPickRange()
 {
 	return 5.0f;
 }
 
-bool SurvivalMode::isCreativeType()
+bool CreativeMode::isCreativeType()
 {
 	return false;
 }
 
-bool SurvivalMode::isSurvivalType()
+bool CreativeMode::isSurvivalType()
 {
 	return true;
 }
diff --git a/source/GameMode/SurvivalMode.hpp b/source/GameMode/CreativeMode.hpp
similarity index 94%
rename from source/GameMode/SurvivalMode.hpp
rename to source/GameMode/CreativeMode.hpp
index e284679..746e398 100644
--- a/source/GameMode/SurvivalMode.hpp
+++ b/source/GameMode/CreativeMode.hpp
@@ -10,10 +10,10 @@
 
 #include "GameMode.hpp"
 
-class SurvivalMode : public GameMode
+class CreativeMode : public GameMode
 {
 public:
-	SurvivalMode(Minecraft*);
+	CreativeMode(Minecraft*);
 
 	virtual void startDestroyBlock(int x, int y, int z, int i) override;
 	virtual bool destroyBlock(int x, int y, int z, int i);
diff --git a/windows_vs/minecraftcpp.vcxproj b/windows_vs/minecraftcpp.vcxproj
index 0b7a6a1..47d1d7c 100644
--- a/windows_vs/minecraftcpp.vcxproj
+++ b/windows_vs/minecraftcpp.vcxproj
@@ -49,7 +49,7 @@
     <ClInclude Include="..\source\Base\Utils.hpp" />
     <ClInclude Include="..\source\Base\Vec3.hpp" />
     <ClInclude Include="..\source\GameMode\GameMode.hpp" />
-    <ClInclude Include="..\source\GameMode\SurvivalMode.hpp" />
+    <ClInclude Include="..\source\GameMode\CreativeMode.hpp" />
     <ClInclude Include="..\source\GUI\AvailableGamesList.hpp" />
     <ClInclude Include="..\source\GUI\Button.hpp" />
     <ClInclude Include="..\source\GUI\Gui.hpp" />
@@ -345,7 +345,7 @@
     <ClCompile Include="..\source\Base\Utils.cpp" />
     <ClCompile Include="..\source\Base\Vec3.cpp" />
     <ClCompile Include="..\source\GameMode\GameMode.cpp" />
-    <ClCompile Include="..\source\GameMode\SurvivalMode.cpp" />
+    <ClCompile Include="..\source\GameMode\CreativeMode.cpp" />
     <ClCompile Include="..\source\GUI\AvailableGamesList.cpp" />
     <ClCompile Include="..\source\GUI\Button.cpp" />
     <ClCompile Include="..\source\GUI\Gui.cpp" />
diff --git a/windows_vs/minecraftcpp.vcxproj.filters b/windows_vs/minecraftcpp.vcxproj.filters
index 35d8b5b..7bd6909 100644
--- a/windows_vs/minecraftcpp.vcxproj.filters
+++ b/windows_vs/minecraftcpp.vcxproj.filters
@@ -348,7 +348,7 @@
     <ClCompile Include="..\source\World\Tile\SandTile.cpp">
       <Filter>Source Files\World\Tile</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\GameMode\SurvivalMode.cpp">
+    <ClCompile Include="..\source\GameMode\CreativeMode.cpp">
       <Filter>Source Files\Game Modes</Filter>
     </ClCompile>
     <ClCompile Include="..\source\World\Tile\ClayTile.cpp">
@@ -1280,7 +1280,7 @@
     <ClInclude Include="..\source\GameMode\GameMode.hpp">
       <Filter>Header Files\Game Modes</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\GameMode\SurvivalMode.hpp">
+    <ClInclude Include="..\source\GameMode\CreativeMode.hpp">
       <Filter>Header Files\Game Modes</Filter>
     </ClInclude>
     <ClInclude Include="..\source\Renderer\RenderList.hpp">