Animator rework