Removed arrow handeling because of bugs