Untested changes for arduplane