More changes

initial comment
- [x]