minor modifications in simulator