Simulation mode added