added animation
merged conflicts