Removed unused stuff
Added animation