Adding comments and a new polyfill