Update to latest AWE code