Added to simulator.py