changed animation
merge