merged into last commit:
- add persistence
- changed emulation section