Huge modification after checkout from 47172ea
Update todo list