Feature/allow arrows