- Add new columns
- optimize the code

- maybe a sound bug -> to check