More update on TODO list