amended #TODOs