added all modif of master branch + some features don't remember