Update to avalon4