Changes to update EAnimator