added 'TODOs' from code review with Sumeet