Addressed todo comments
Merged