Experimental changes to drag and debug output