Luis: fix arrows and animation need cleaning the code :P