diff --git a/DebugUtils/Source/RecastDebugDraw.cpp b/DebugUtils/Source/RecastDebugDraw.cpp
index aec1523..5c3cb34 100644
--- a/DebugUtils/Source/RecastDebugDraw.cpp
+++ b/DebugUtils/Source/RecastDebugDraw.cpp
@@ -31,7 +31,7 @@ void duDebugDrawTriMesh(duDebugDraw* dd, const float* verts, int nverts,
 						const int* tris, const float* normals, int ntris,
 						const unsigned char* flags)
 {
-	dd->begin(DU_DRAW_TRIS, ntris);
+	dd->begin(DU_DRAW_TRIS);
 	for (int i = 0; i < ntris*3; i += 3)
 	{
 		unsigned int color;
@@ -54,7 +54,7 @@ void duDebugDrawTriMeshSlope(duDebugDraw* dd, const float* verts, int nverts,
 {
 	const float walkableThr = cosf(walkableSlopeAngle/180.0f*(float)M_PI);
 
-	dd->begin(DU_DRAW_TRIS, ntris);
+	dd->begin(DU_DRAW_TRIS);
 	for (int i = 0; i < ntris*3; i += 3)
 	{
 		const float* norm = &normals[i];
@@ -305,7 +305,7 @@ void duDebugDrawCompactHeightfieldSolid(duDebugDraw* dd, const rcCompactHeightfi
 
 	unsigned int color = duRGBA(0,192,255,64);
 	
-	dd->begin(DU_DRAW_QUADS, chf.spanCount*4);
+	dd->begin(DU_DRAW_QUADS);
 	
 	for (int y = 0; y < chf.height; ++y)
 	{
@@ -334,7 +334,7 @@ void duDebugDrawCompactHeightfieldRegions(duDebugDraw* dd, const rcCompactHeight
 	const float cs = chf.cs;
 	const float ch = chf.ch;
 
-	dd->begin(DU_DRAW_QUADS, chf.spanCount*4);
+	dd->begin(DU_DRAW_QUADS);
 
 	for (int y = 0; y < chf.height; ++y)
 	{
@@ -375,7 +375,7 @@ void duDebugDrawCompactHeightfieldDistance(duDebugDraw* dd, const rcCompactHeigh
 	if (maxd < 1.0f) maxd = 1;
 	const float dscale = 255.0f / maxd;
 	
-	dd->begin(DU_DRAW_QUADS, chf.spanCount*4);
+	dd->begin(DU_DRAW_QUADS);
 	
 	for (int y = 0; y < chf.height; ++y)
 	{
diff --git a/RecastDemo/Bin/Recast.exe b/RecastDemo/Bin/Recast.exe
index 7d3a0ad..5d80a3a 100644
Binary files a/RecastDemo/Bin/Recast.exe and b/RecastDemo/Bin/Recast.exe differ
diff --git a/RecastDemo/Build/VC9/Recast.vcproj b/RecastDemo/Build/VC9/Recast.vcproj
index 6a78781..5d6cde9 100644
--- a/RecastDemo/Build/VC9/Recast.vcproj
+++ b/RecastDemo/Build/VC9/Recast.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\Contrib\SDL\include;..\..\Include;..\..\..\Detour\Include;..\..\..\Recast\Include;..\..\Contrib;$(NOINHERIT)"
+				AdditionalIncludeDirectories="..\..\Contrib\SDL\include;..\..\Include;..\..\..\Detour\Include;..\..\..\DebugUtils\Include;..\..\..\Recast\Include;..\..\Contrib;$(NOINHERIT)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -117,7 +117,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\Contrib\SDL\include;..\..\Include;..\..\..\Detour\Include;..\..\..\Recast\Include;..\..\Contrib"
+				AdditionalIncludeDirectories="..\..\..\DebugUtils\Include;..\..\Contrib\SDL\include;..\..\Include;..\..\..\Detour\Include;..\..\..\Recast\Include;..\..\Contrib"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -187,10 +187,6 @@
 					RelativePath="..\..\..\Recast\Include\Recast.h"
 					>
 				</File>
-				<File
-					RelativePath="..\..\..\Recast\Include\RecastDebugDraw.h"
-					>
-				</File>
 				<File
 					RelativePath="..\..\..\Recast\Include\RecastLog.h"
 					>
@@ -211,10 +207,6 @@
 					RelativePath="..\..\..\Recast\Source\RecastContour.cpp"
 					>
 				</File>
-				<File
-					RelativePath="..\..\..\Recast\Source\RecastDebugDraw.cpp"
-					>
-				</File>
 				<File
 					RelativePath="..\..\..\Recast\Source\RecastFilter.cpp"
 					>
@@ -255,10 +247,6 @@
 					RelativePath="..\..\..\Detour\Include\DetourCommon.h"
 					>
 				</File>
-				<File
-					RelativePath="..\..\..\Detour\Include\DetourDebugDraw.h"
-					>
-				</File>
 				<File
 					RelativePath="..\..\..\Detour\Include\DetourNavMesh.h"
 					>
@@ -271,22 +259,6 @@
 					RelativePath="..\..\..\Detour\Include\DetourNode.h"
 					>
 				</File>
-				<File
-					RelativePath="..\..\..\Detour\Include\DetourStatNavMesh.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\Detour\Include\DetourStatNavMeshBuilder.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\Detour\Include\DetourTileNavMesh.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\Detour\Include\DetourTileNavMeshBuilder.h"
-					>
-				</File>
 			</Filter>
 			<Filter
 				Name="Source"
@@ -295,10 +267,6 @@
 					RelativePath="..\..\..\Detour\Source\DetourCommon.cpp"
 					>
 				</File>
-				<File
-					RelativePath="..\..\..\Detour\Source\DetourDebugDraw.cpp"
-					>
-				</File>
 				<File
 					RelativePath="..\..\..\Detour\Source\DetourNavMesh.cpp"
 					>
@@ -311,22 +279,6 @@
 					RelativePath="..\..\..\Detour\Source\DetourNode.cpp"
 					>
 				</File>
-				<File
-					RelativePath="..\..\..\Detour\Source\DetourStatNavMesh.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\Detour\Source\DetourStatNavMeshBuilder.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\Detour\Source\DetourTileNavMesh.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\Detour\Source\DetourTileNavMeshBuilder.cpp"
-					>
-				</File>
 			</Filter>
 		</Filter>
 		<Filter
@@ -355,10 +307,6 @@
 					RelativePath="..\..\Include\Sample.h"
 					>
 				</File>
-				<File
-					RelativePath="..\..\Include\Sample_DynMesh.h"
-					>
-				</File>
 				<File
 					RelativePath="..\..\Include\Sample_SoloMesh.h"
 					>
@@ -407,10 +355,6 @@
 					RelativePath="..\..\Source\Sample.cpp"
 					>
 				</File>
-				<File
-					RelativePath="..\..\Source\Sample_DynMesh.cpp"
-					>
-				</File>
 				<File
 					RelativePath="..\..\Source\Sample_SoloMesh.cpp"
 					>
@@ -429,6 +373,50 @@
 				</File>
 			</Filter>
 		</Filter>
+		<Filter
+			Name="DebugUtils"
+			>
+			<Filter
+				Name="Include"
+				>
+				<File
+					RelativePath="..\..\..\DebugUtils\Include\DebugDraw.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\DebugUtils\Include\DetourDebugDraw.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\DebugUtils\Include\RecastDebugDraw.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\DebugUtils\Include\RecastDump.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Source"
+				>
+				<File
+					RelativePath="..\..\..\DebugUtils\Source\DebugDraw.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\DebugUtils\Source\DetourDebugDraw.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\DebugUtils\Source\RecastDebugDraw.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\DebugUtils\Source\RecastDump.cpp"
+					>
+				</File>
+			</Filter>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>