More work on the polyfill