- simulator restriction
- token bug fixed