Added manual charting