TODO-list updated