Update with Avalon4 design