Removed TODO
Added task