Added new TODOs and comment