Partial update of the examples to use <Simulation> element, closer to earlier form