Attempts at fixing animations