Further arrow handling logic