added more features to TODO.