Added Arrow effect + fixed data order