Toc Done, charts now using simQuery & chartScenarioTypes rather than series