Updated with Charting code