Final version : forgot to add some lines