Revert "Revert "Legeres modifications""

This reverts commit 731cccfc37c183846e56cbbf552d58593f2bdb8b.