three todo changes