Simulation overhaul