Fill TODO in updated questions