Rework of Simulation process