Arrow functionality upgraded