Revert "Last modifications"

This reverts commit c2c3faf512ad990a111c642ba043b49dac4ca46f.
Revert "Revert "Last modifications""

This reverts commit e9eb3066c91f7c6836dfa633b5c215dfc9a66fa6.