merged pull request and deleteArrows branch