Big modification (temporary)

- only for testing
- to rework
- to comment