Update to follow @ljhard's recommandations