added animation
merge