Remove comment from template
Change chart with calculating