Added new TODOs
New TODOs added