Arrow functionality improved