lots of changes made, including the chart