Simulation and visualisation improvements for new mode setup