Added animation, but it's buggy