4.0

Update to Avalon 2.0