Merging of the different versions
Actually merged the files... srry for last useless commit