Simulaton functionality update