Update of the 'TO DO' sections