Improve graph, use polyfill.io