Improved charting