[Fabric 004] arrow redo