deal with more TODOs