More polyfill friendly approach