simulator.py: Updating simulator