Add Feature that simulator
Fix: some bugs