Update comment and TODO
Update comment and TODO