TODO list updated
Merge wish last version of alex