- add removing my place
- bugfixing
- refactoring