changes from paul.chartio.org