Revert "Better ?"

This reverts commit f325bb76b00c35e34afb4e8a43a74f3f0aa65ac9.