Modifs on Dom's recommandations
Manage conflict