Update for Avalon4