Updated polyfill