Changes made to CSimulator