Updating new chart
Merge conflicts resolved