working animation
before rebase