[develop/features]
- do some modifications