fixing animations
merge