resolved TODOs