fixed conflicts, removed arrow idea