adding the chart library and more changes
fixed conflict