[Fabric 007] arrow redo