fixed a major design flaw in the simulator