Adding Eric suggestions to todo-list