Simulator

merged changes in simulator