Partially fixed the animations