Reorganized the chart a bit.