Revert "Revert "Peaufinage""

This reverts commit 5037e5452bd5247a371311b0fe4bc6b129351762.