diff --git a/ArduCopterMega/APM_Config.h b/ArduCopterMega/APM_Config.h
index 97a846f2e7..625cda8cfc 100644
--- a/ArduCopterMega/APM_Config.h
+++ b/ArduCopterMega/APM_Config.h
@@ -6,10 +6,11 @@
 
 //#define HIL_MODE	HIL_MODE_ATTITUDE
 
+//#define LOITER_TEST 1
 
 //#define BROKEN_SLIDER		0		// 1 = yes (use Yaw to enter CLI mode)
 
-#define FRAME_CONFIG QUAD_FRAME
+//#define FRAME_CONFIG QUAD_FRAME
 	/*
 	options:
 	QUAD_FRAME
@@ -20,7 +21,7 @@
 	HELI_FRAME
 	*/
 
-#define FRAME_ORIENTATION X_FRAME
+//#define FRAME_ORIENTATION X_FRAME
 	/*
 	PLUS_FRAME
 	X_FRAME
@@ -28,7 +29,7 @@
 	*/
 
 
-#define CHANNEL_6_TUNING CH6_NONE
+//#define CHANNEL_6_TUNING CH6_NONE
 	/*
 	CH6_NONE
 	CH6_STABILIZE_KP