- correct problem in playing mode
- refactoring
- pack TD stuff in separate calls
- refactoring