Made quite a few things right for the chart