modif qui sert a rien
merged
added a todo