Some change in Chart and examples