ready for merge simulator
merge simulator 1