new_todo & some changes