First working version

Arrow works properly