Updating name for Calculate class
Adding chart