Update polyfill part

I was not so happy with the previous version.