Updating for new charting logic