Animation links refactor