Update to latest Aviator code