Upgrade Animation Logic (with polyfill)