updated #TODOs
updated #TODOs