reworked animation
merge conflicts solved