Now its better :)
Updated TODO.